summaryrefslogtreecommitdiff
path: root/configs/test
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-04-28 15:41:22 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-04-28 15:41:22 -0400
commitca8a659394e96a0a0c11693cbaae59e6b027795a (patch)
tree79f9509a48359bbc870ae34ce8b6e2fc6bc027de /configs/test
parent7bb70e3e30f30c669e475c47b950f0abd24367d0 (diff)
parentb43d1a00fb69015c751fba57d22a6fa94a292f04 (diff)
downloadgem5-ca8a659394e96a0a0c11693cbaae59e6b027795a.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : d6f7c4dd146613eeba39249f2d916a77108bc8c1
Diffstat (limited to 'configs/test')
-rw-r--r--configs/test/fs.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/configs/test/fs.py b/configs/test/fs.py
index 6cd4185ed..ce121bd76 100644
--- a/configs/test/fs.py
+++ b/configs/test/fs.py
@@ -139,9 +139,13 @@ class LinuxTsunami(BaseTsunami):
pci_func=0, pci_dev=0, pci_bus=0)
class LinuxAlphaSystem(LinuxAlphaSystem):
- magicbus = Bus()
+ magicbus = Bus(bus_id=0)
+ magicbus2 = Bus(bus_id=1)
+ bridge = Bridge()
physmem = PhysicalMemory(range = AddrRange('128MB'))
- c1 = Connector(side_a=Parent.physmem, side_b=Parent.magicbus)
+ c0a = Connector(side_a=Parent.magicbus, side_b=Parent.bridge, side_b_name="side_a")
+ c0b = Connector(side_a=Parent.magicbus2, side_b=Parent.bridge, side_b_name="side_b")
+ c1 = Connector(side_a=Parent.physmem, side_b=Parent.magicbus2)
tsunami = LinuxTsunami()
c2 = Connector(side_a=Parent.tsunami.cchip, side_a_name='pio', side_b=Parent.magicbus)
c3 = Connector(side_a=Parent.tsunami.pchip, side_a_name='pio', side_b=Parent.magicbus)
@@ -177,7 +181,7 @@ class LinuxAlphaSystem(LinuxAlphaSystem):
read_only=True)
simple_disk = SimpleDisk(disk=Parent.raw_image)
intrctrl = IntrControl()
- cpu = SimpleCPU(mem=Parent.magicbus)
+ cpu = SimpleCPU(mem=Parent.magicbus2)
sim_console = SimConsole(listener=ConsoleListener(port=3456))
kernel = '/z/saidi/work/m5.newmem/build/vmlinux'
pal = binary('ts_osfpal')