diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-17 22:08:44 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-17 22:08:44 -0400 |
| commit | 935ba67b4fbe595c0496e0230e39cd8ed87b7543 (patch) | |
| tree | 7ca8a6e950915cb553ae8a57e47ec380bafe0dc5 /configs | |
| parent | 5da14ec60af9f6f9153963eef057257be9be8a62 (diff) | |
| download | gem5-935ba67b4fbe595c0496e0230e39cd8ed87b7543.tar.xz | |
Get basic full-system working with AtomicSimpleCPU.
SConscript:
Comment out sinic for now... needs to be fixed to compile under newmem.
configs/test/SysPaths.py:
Fix paths.
configs/test/fs.py:
SimpleCPU -> AtomicSimpleCPU
Fix vmlinux path
cpu/simple/atomic.cc:
Fix suspendContext() so quiesce works.
Don't forget to checkForInterrupts().
cpu/simple/base.cc:
Minor fix to interrupt check code.
dev/ide_disk.hh:
Don't declare regStats() in header since it's not in
.cc file anymore (will need to add it back in when
stats are added back).
dev/io_device.cc:
Set packet dest to Packet::Broadcast.
dev/pciconfigall.cc:
Set PCI config packet result to Success.
python/m5/objects/Root.py:
Add debug object to Root so things like break_cycles
can be set from command line.
--HG--
extra : convert_revision : aa1c652fe589784e753e13ad9acb0cd5f3b6eafb
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/test/SysPaths.py | 6 | ||||
| -rw-r--r-- | configs/test/fs.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configs/test/SysPaths.py b/configs/test/SysPaths.py index 7f231916c..c7c7db4e7 100644 --- a/configs/test/SysPaths.py +++ b/configs/test/SysPaths.py @@ -22,11 +22,11 @@ BINDIR = SYSTEMDIR + '/binaries' DISKDIR = SYSTEMDIR + '/disks' def disk(file): - return '%s/%s' % (DISKDIR, file) + return os.path.join(DISKDIR, file) def binary(file): - return '%s/%s' % (BINDIR, file) + return os.path.join(BINDIR, file) def script(file): - return '%s/%s' % ('/z/saidi/work/m5.newmem/configs/boot', file) + return os.path.join(SYSTEMDIR, 'boot', file) diff --git a/configs/test/fs.py b/configs/test/fs.py index ce121bd76..fdbf86abe 100644 --- a/configs/test/fs.py +++ b/configs/test/fs.py @@ -181,9 +181,9 @@ class LinuxAlphaSystem(LinuxAlphaSystem): read_only=True) simple_disk = SimpleDisk(disk=Parent.raw_image) intrctrl = IntrControl() - cpu = SimpleCPU(mem=Parent.magicbus2) + cpu = AtomicSimpleCPU(mem=Parent.magicbus2) sim_console = SimConsole(listener=ConsoleListener(port=3456)) - kernel = '/z/saidi/work/m5.newmem/build/vmlinux' + kernel = binary('vmlinux') pal = binary('ts_osfpal') console = binary('console') boot_osflags = 'root=/dev/hda1 console=ttyS0' |