49c49
< def create_system(options, phys_mem, piobus, dma_devices):
---
> def create_system(options, system, piobus, dma_devices):
84,85c84,85
< physMemPort = phys_mem.port,
< physmem = phys_mem)
---
> physMemPort = system.physmem.port,
> physmem = system.physmem)
94a95,96
>
> exec("system.l1_cntrl%d = l1_cntrl" % i)
101c103,104
< phys_mem_size = long(phys_mem.range.second) - long(phys_mem.range.first) + 1
---
> phys_mem_size = long(system.physmem.range.second) - \
> long(system.physmem.range.first) + 1
116,119c119,124
< RubyDirectoryMemory(version = i,
< size = dir_size,
< use_map = options.use_map,
< map_levels = options.map_levels),
---
> RubyDirectoryMemory( \
> version = i,
> size = dir_size,
> use_map = options.use_map,
> map_levels = \
> options.map_levels),
121a127
> exec("system.dir_cntrl%d = dir_cntrl" % i)
129,130c135,136
< physMemPort = phys_mem.port,
< physmem = phys_mem)
---
> physMemPort = system.physmem.port,
> physmem = system.physmem)
134a141
> exec("system.dma_cntrl%d = dma_cntrl" % i)