diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 14:57:51 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 14:57:51 -0400 |
| commit | 6240f8c4bcf12e3367905adfba066bb14f79262a (patch) | |
| tree | e2e80d694535522023114f20ce97419b2b2ee71e /sim | |
| parent | bb80f71f213625e0b33db5cf2256f93caf3d5967 (diff) | |
| download | gem5-6240f8c4bcf12e3367905adfba066bb14f79262a.tar.xz | |
fixes for newmem
ALPHA_FS finally compiles again
SConscript:
Use a couple more FS sources, still don't compile that much
arch/alpha/faults.hh:
the unimp fault should probably exist in nonfs too.
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/simconsole.cc:
dev/simple_disk.cc:
dev/simple_disk.hh:
dev/uart.cc:
dev/uart.hh:
dev/uart8250.cc:
dev/uart8250.hh:
sim/process.cc:
sim/system.cc:
fixes for newmem
dev/io_device.hh:
a system pointer is probably useful for every device to have
mem/bus.hh:
mem/physical.cc:
new address ranges function
python/m5/objects/SimpleDisk.py:
simple disk now has a system pointer rather than physmem directly
--HG--
extra : convert_revision : d8c0a5c6510a6210aec5e8adfb0a4a06ec0dcebf
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/process.cc | 2 | ||||
| -rw-r--r-- | sim/system.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sim/process.cc b/sim/process.cc index b483c70dc..4e4a54572 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -39,7 +39,7 @@ #include "config/full_system.hh" #include "cpu/exec_context.hh" #include "mem/page_table.hh" -#include "mem/mem_object.hh" +#include "mem/physical.hh" #include "mem/translating_port.hh" #include "sim/builder.hh" #include "sim/process.hh" diff --git a/sim/system.cc b/sim/system.cc index 17845ef76..ca9d68d77 100644 --- a/sim/system.cc +++ b/sim/system.cc @@ -4,6 +4,7 @@ #include "base/trace.hh" #include "cpu/exec_context.hh" #include "mem/mem_object.hh" +#include "mem/physical.hh" #include "sim/builder.hh" #include "sim/byteswap.hh" #include "sim/system.hh" @@ -11,7 +12,6 @@ #include "arch/vtophys.hh" #include "base/remote_gdb.hh" #include "kern/kernel_stats.hh" -#include "mem/physical.hh" #endif using namespace std; @@ -242,7 +242,7 @@ DEFINE_SIM_OBJECT_CLASS_NAME("System", System) BEGIN_DECLARE_SIM_OBJECT_PARAMS(System) - SimObjectParam<MemObject *> physmem; + SimObjectParam<PhysicalMemory *> physmem; END_DECLARE_SIM_OBJECT_PARAMS(System) |