sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: fixed how ruby_fs creates phsyical memory

Browse source 
Now ruby_fs creates physical memory of the right size.
This commit is contained in:
Brad Beckmann 2010-03-21 21:22:20 -07:00
parent 0368ef915a
commit d8e1e5abd0
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configs/common/FSConfig.py
View file

@ -79,14 +79,14 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None):
return self return self
def makeLinuxAlphaRubySystem(mem_mode, phys_mem, mdesc = None): def makeLinuxAlphaRubySystem(mem_mode, mdesc = None):
class BaseTsunami(Tsunami): class BaseTsunami(Tsunami):
ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0) ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0)
ide = IdeController(disks=[Parent.disk0, Parent.disk2], ide = IdeController(disks=[Parent.disk0, Parent.disk2],
pci_func=0, pci_dev=0, pci_bus=0) pci_func=0, pci_dev=0, pci_bus=0)
physmem = PhysicalMemory(range = AddrRange(mdesc.mem()))
self = LinuxAlphaSystem(physmem = phys_mem) self = LinuxAlphaSystem(physmem = physmem)
if not mdesc: if not mdesc:
# generic system # generic system
mdesc = SysConfig() mdesc = SysConfig()
@ -100,7 +100,7 @@ def makeLinuxAlphaRubySystem(mem_mode, phys_mem, mdesc = None):
# RubyPort currently does support functional accesses. Therefore provide # RubyPort currently does support functional accesses. Therefore provide
# the piobus a direct connection to physical memory # the piobus a direct connection to physical memory
# #
self.piobus.port = phys_mem.port self.piobus.port = physmem.port
self.disk0 = CowIdeDisk(driveID='master') self.disk0 = CowIdeDisk(driveID='master')
self.disk2 = CowIdeDisk(driveID='master') self.disk2 = CowIdeDisk(driveID='master')

6
configs/example/ruby_fs.py
View file

@ -116,12 +116,10 @@ FutureClass = None
CPUClass.clock = options.clock CPUClass.clock = options.clock
physmem = PhysicalMemory() system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
system = makeLinuxAlphaRubySystem(test_mem_mode, physmem, bm[0])
system.ruby = Ruby.create_system(options, system.ruby = Ruby.create_system(options,
physmem, system.physmem,
system.piobus, system.piobus,
system.dma_devices) system.dma_devices)