1 files changed, 12 insertions, 29 deletions

diff --git a/src/sim/system.hh b/src/sim/system.hh
index 53f1762c7..eb192fb99 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -53,29 +53,23 @@
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/statistics.hh"
-#include "config/full_system.hh"
 #include "cpu/pc_event.hh"
 #include "enums/MemoryMode.hh"
+#include "kern/system_events.hh"
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
 #include "params/System.hh"
 
-#if FULL_SYSTEM
-#include "kern/system_events.hh"
-#endif
-
 class BaseCPU;
-class ThreadContext;
+class BaseRemoteGDB;
+class FSTranslatingPortProxy;
+class GDBListener;
 class ObjectFile;
 class PhysicalMemory;
-
-#if FULL_SYSTEM
 class Platform;
 class PortProxy;
-class FSTranslatingPortProxy;
-#endif
-class GDBListener;
-class BaseRemoteGDB;
+class ThreadContext;
+class VirtualPort;
 
 class System : public MemObject
 {
@@ -181,8 +175,8 @@ class System : public MemObject
      */
     bool isMemory(const Addr addr) const;
 
-#if FULL_SYSTEM
-    Platform *platform;
+    Addr pagePtr;
+
     uint64_t init_param;
 
     /** Port to physical memory used for writing object files into ram at
@@ -213,10 +207,6 @@ class System : public MemObject
      */
     Addr loadAddrMask;
 
-#else
-
-    Addr pagePtr;
-
   protected:
     uint64_t nextPID;
 
@@ -232,9 +222,6 @@ class System : public MemObject
     /** Amount of physical memory that exists */
     Addr memSize();
 
-
-#endif // FULL_SYSTEM
-
   protected:
     Enums::MemoryMode memoryMode;
     uint64_t workItemsBegin;
@@ -290,13 +277,15 @@ class System : public MemObject
 
     void workItemEnd(uint32_t tid, uint32_t workid);
 
-#if FULL_SYSTEM
     /**
      * Fix up an address used to match PCs for hooking simulator
      * events on to target function executions.  See comment in
      * system.cc for details.
      */
-    virtual Addr fixFuncEventAddr(Addr addr) = 0;
+    virtual Addr fixFuncEventAddr(Addr addr)
+    {
+        panic("Base fixFuncEventAddr not implemented.\n");
+    }
 
     /**
      * Add a function-based event to the given function, to be looked
@@ -322,7 +311,6 @@ class System : public MemObject
         return addFuncEvent<T>(kernelSymtab, lbl);
     }
 
-#endif
   public:
     std::vector<BaseRemoteGDB *> remoteGDB;
     std::vector<GDBListener *> gdbListen;
@@ -344,7 +332,6 @@ class System : public MemObject
 
   public:
 
-#if FULL_SYSTEM
     /**
      * Returns the addess the kernel starts at.
      * @return address the kernel starts at
@@ -363,14 +350,10 @@ class System : public MemObject
      */
     Addr getKernelEntry() const { return kernelEntry; }
 
-#else
-
     /// Allocate npages contiguous unused physical pages
     /// @return Starting address of first page
     Addr allocPhysPages(int npages);
 
-#endif // FULL_SYSTEM
-
     int registerThreadContext(ThreadContext *tc, int assigned=-1);
     void replaceThreadContext(ThreadContext *tc, int context_id);