diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-05-04 21:10:51 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-05-04 21:10:51 -0400 |
| commit | de8eba689164b59679a3e3ef3550bc7abb5ecdce (patch) | |
| tree | 357184f755ef18190b97547cf5bff888344066ba /configs | |
| parent | 2e7e844768e160bf81be53d6b633f3851bb4ea80 (diff) | |
| parent | 8a9d270f6c17efa79f38e629c7cbcafa51aa8494 (diff) | |
| download | gem5-de8eba689164b59679a3e3ef3550bc7abb5ecdce.tar.xz | |
Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem
--HG--
extra : convert_revision : c48a8857f5a520ff8061eb3d8f08dcd43661e68c
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/test/fs.py | 10 | ||||
| -rwxr-xr-x | configs/test/hello_sparc | bin | 587552 -> 644149 bytes |
2 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') diff --git a/configs/test/hello_sparc b/configs/test/hello_sparc Binary files differindex 7b7302771..e254ae33f 100755 --- a/configs/test/hello_sparc +++ b/configs/test/hello_sparc |