summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/process.cc2
-rw-r--r--sim/system.cc4
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)