diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
commit | 5825a6c9d82b813d983b688da5f1ce18c90f774f (patch) | |
tree | a5be1a1c3968ff57d387523f95e46bcb2797c121 /configs | |
parent | 7f39644609e19ada9e94c9bbb09c3e625fa6e8ed (diff) | |
parent | bfd5eb2b08dad700d085a637d5e16a61dcc530d7 (diff) | |
download | gem5-5825a6c9d82b813d983b688da5f1ce18c90f774f.tar.xz |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix
configs/example/fs.py:
configs/example/se.py:
src/mem/tport.hh:
Hand merge.
--HG--
extra : convert_revision : b9df95534d43b3b311f24ae24717371d03d615bf
Diffstat (limited to 'configs')
-rw-r--r-- | configs/example/fs.py | 2 | ||||
-rw-r--r-- | configs/example/se.py | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py index 3ce463879..67c3912ef 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -107,13 +107,11 @@ for i in xrange(np): test_sys.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'), L1Cache(size = '64kB')) test_sys.cpu[i].connectMemPorts(test_sys.membus) - test_sys.cpu[i].mem = test_sys.physmem if len(bm) == 2: drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1]) drive_sys.cpu = DriveCPUClass(cpu_id=0) drive_sys.cpu.connectMemPorts(drive_sys.membus) - drive_sys.cpu.mem = drive_sys.physmem root = makeDualRoot(test_sys, drive_sys, options.etherdump) elif len(bm) == 1: root = Root(clock = '1THz', system = test_sys) diff --git a/configs/example/se.py b/configs/example/se.py index 83c2b1f8d..1d92eb954 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -118,7 +118,6 @@ for i in xrange(np): system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'), L1Cache(size = '64kB')) system.cpu[i].connectMemPorts(system.membus) - system.cpu[i].mem = system.physmem system.cpu[i].workload = process root = Root(system = system) |