58c58
< def makeLinuxAlphaSystem(mem_mode, MemClass, mdesc = None):
---
> def makeLinuxAlphaSystem(mem_mode, mdesc = None):
76,77c76
< self.physmem = MemClass(range = AddrRange(mdesc.mem()))
< self.mem_ranges = [self.physmem.range]
---
> self.mem_ranges = [AddrRange(mdesc.mem())]
80d78
< self.physmem.port = self.membus.master
107c105
< def makeLinuxAlphaRubySystem(mem_mode, MemClass, mdesc = None):
---
> def makeLinuxAlphaRubySystem(mem_mode, mdesc = None):
112,115c110,111
<
< physmem = MemClass(range = AddrRange(mdesc.mem()))
< self = LinuxAlphaSystem(physmem = physmem)
< self.mem_ranges = [self.physmem.range]
---
> self = LinuxAlphaSystem()
> self.mem_ranges = [AddrRange(mdesc.mem())]
124,130d119
< #
< # Pio functional accesses from devices need direct access to memory
< # RubyPort currently does support functional accesses. Therefore provide
< # the piobus a direct connection to physical memory
< #
< self.piobus.master = physmem.port
<
160c149
< def makeSparcSystem(mem_mode, MemClass, mdesc = None):
---
> def makeSparcSystem(mem_mode, mdesc = None):
183,185c172,173
< self.physmem = MemClass(range = AddrRange(Addr('1MB'), size = '64MB'))
< self.physmem2 = MemClass(range = AddrRange(Addr('2GB'), size ='256MB'))
< self.mem_ranges = [self.physmem.range, self.physmem2.range]
---
> self.mem_ranges = [AddrRange(Addr('1MB'), size = '64MB'),
> AddrRange(Addr('2GB'), size ='256MB')]
188,189d175
< self.physmem.port = self.membus.master
< self.physmem2.port = self.membus.master
228c214
< def makeArmSystem(mem_mode, machine_type, MemClass, mdesc = None,
---
> def makeArmSystem(mem_mode, machine_type, mdesc = None,
276,277c262
< self.physmem = MemClass(range = AddrRange(Addr(mdesc.mem())))
< self.mem_ranges = [self.physmem.range]
---
> self.mem_ranges = [AddrRange(mdesc.mem())]
291,295c276,277
<
< self.physmem = MemClass(range = AddrRange(self.realview.mem_start_addr,
< size = mdesc.mem()),
< conf_table_reported = True)
< self.mem_ranges = [self.physmem.range]
---
> self.mem_ranges = [AddrRange(self.realview.mem_start_addr,
> size = mdesc.mem())]
303,304d284
<
< self.physmem.port = self.membus.master
316c296
< def makeLinuxMipsSystem(mem_mode, MemClass, mdesc = None):
---
> def makeLinuxMipsSystem(mem_mode, mdesc = None):
330,331c310
< self.physmem = MemClass(range = AddrRange('1GB'))
< self.mem_ranges = [self.physmem.range]
---
> self.mem_ranges = [AddrRange('1GB')]
334d312
< self.physmem.port = self.membus.master
372d349
< x86_sys.physmem.port = x86_sys.membus.master
412,417d388
< #
< # Pio functional accesses from devices need direct access to memory
< # RubyPort currently does support functional accesses. Therefore provide
< # the piobus a direct connection to physical memory
< #
< x86_sys.piobus.master = x86_sys.physmem.port
424c395
< def makeX86System(mem_mode, MemClass, numCPUs = 1, mdesc = None, self = None,
---
> def makeX86System(mem_mode, numCPUs = 1, mdesc = None, self = None,
437,438c408
< self.physmem = MemClass(range = AddrRange(mdesc.mem()))
< self.mem_ranges = [self.physmem.range]
---
> self.mem_ranges = [AddrRange(mdesc.mem())]
521c491
< def makeLinuxX86System(mem_mode, MemClass, numCPUs = 1, mdesc = None,
---
> def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None,
526c496
< makeX86System(mem_mode, MemClass, numCPUs, mdesc, self, Ruby)
---
> makeX86System(mem_mode, numCPUs, mdesc, self, Ruby)
530,531c500
< phys_mem_size = sum(map(lambda mem: mem.range.size(),
< self.memories.unproxy(self)))
---
> phys_mem_size = sum(map(lambda r: r.size(), self.mem_ranges))