# HG changeset patch
# User Brad Beckmann <[email protected]>
# Date 1268935351 25200
# Node ID dae220c537fa5ac8a6a5ce5e0d10cb6fc124a0db
# Parent 801f9d330c85af02ec2e455872650770bd86ed71
ruby: fixed how ruby_fs creates phsyical memory
Now ruby_fs creates physical memory of the right size.
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -79,14 +79,14 @@
return self
-def makeLinuxAlphaRubySystem(mem_mode, phys_mem, mdesc = None):
+def makeLinuxAlphaRubySystem(mem_mode, mdesc = None):
class BaseTsunami(Tsunami):
ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0)
ide = IdeController(disks=[Parent.disk0, Parent.disk2],
pci_func=0, pci_dev=0, pci_bus=0)
-
- self = LinuxAlphaSystem(physmem = phys_mem)
+ physmem = PhysicalMemory(range = AddrRange(mdesc.mem()))
+ self = LinuxAlphaSystem(physmem = physmem)
if not mdesc:
# generic system
mdesc = SysConfig()
@@ -100,7 +100,7 @@
# RubyPort currently does support functional accesses. Therefore provide
# 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.disk2 = CowIdeDisk(driveID='master')
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -116,12 +116,10 @@
CPUClass.clock = options.clock
-physmem = PhysicalMemory()
-
-system = makeLinuxAlphaRubySystem(test_mem_mode, physmem, bm[0])
+system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
system.ruby = Ruby.create_system(options,
- physmem,
+ system.physmem,
system.piobus,
system.dma_devices)
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
