summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/process.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/sim/process.hh b/sim/process.hh
index e7e0b8a9b..cdd28982d 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -42,15 +42,15 @@
#include "base/statistics.hh"
#include "base/trace.hh"
-#include "mem/base_mem.hh"
-#include "mem/mem_interface.hh"
+#include "mem/memory.hh"
+//#include "mem/mem_interface.hh"
#include "mem/page_table.hh"
#include "sim/sim_object.hh"
#include "sim/stats.hh"
#include "targetarch/isa_traits.hh"
class ExecContext;
-class FunctionalMemory;
+class Memory;
class System;
class Process : public SimObject
@@ -128,7 +128,7 @@ class Process : public SimObject
protected:
/// Memory object for initialization (image loading)
- FunctionalMemory *initVirtMem;
+ Memory *initVirtMem;
public:
PageTable *pTable;