Merge zizzer:/bk/newmem

[gem5.git] / src / sim / system.hh

diff --git a/src/sim/system.hh b/src/sim/system.hh
index 3ab1d81f29b3b91b9230ae684c4f908d4af9bfea..b3a67bf7a74d8fbcd4f717896257de7d450f3344 100644 (file)
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -56,28 +56,25 @@ class PhysicalMemory;
 #if FULL_SYSTEM
 class Platform;
 class GDBListener;
-class RemoteGDB;
+namespace TheISA
+{
+    class RemoteGDB;
+}
 #endif
 
 class System : public SimObject
 {
   public:
-    enum MemoryMode {
-        Invalid=0,
-        Atomic,
-        Timing
-    };
 
     static const char *MemoryModeStrings[3];
 
-
-    MemoryMode getMemoryMode() { assert(memoryMode); return memoryMode; }
+    SimObject::MemoryMode getMemoryMode() { assert(memoryMode); return memoryMode; }
 
     /** Change the memory mode of the system. This should only be called by the
      * python!!
      * @param mode Mode to change to (atomic/timing)
      */
-    void setMemoryMode(MemoryMode mode);
+    void setMemoryMode(SimObject::MemoryMode mode);
 
     PhysicalMemory *physmem;
     PCEventQueue pcEventQueue;
@@ -126,7 +123,7 @@ class System : public SimObject
 
   protected:
 
-    MemoryMode memoryMode;
+    SimObject::MemoryMode memoryMode;
 
 #if FULL_SYSTEM
     /**
@@ -163,7 +160,7 @@ class System : public SimObject
 #endif
   public:
 #if FULL_SYSTEM
-    std::vector<RemoteGDB *> remoteGDB;
+    std::vector<TheISA::RemoteGDB *> remoteGDB;
     std::vector<GDBListener *> gdbListen;
     virtual bool breakpoint() = 0;
 #endif // FULL_SYSTEM
@@ -173,7 +170,7 @@ class System : public SimObject
     {
         std::string name;
         PhysicalMemory *physmem;
-        MemoryMode mem_mode;
+        SimObject::MemoryMode mem_mode;
 
 #if FULL_SYSTEM
         Tick boot_cpu_frequency;