From 8ad2b8c5596b817267fbf7a39e6ce28ffb49789c Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 31 Oct 2011 02:58:22 -0700
Subject: SE/FS: Make the functions available from the TC consistent between SE
 and FS.

---
 src/cpu/simple_thread.hh | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'src/cpu/simple_thread.hh')

diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index 4baf832f6..817fdf8ef 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -45,21 +45,22 @@
 #include "cpu/thread_state.hh"
 #include "debug/FloatRegs.hh"
 #include "debug/IntRegs.hh"
+#include "mem/page_table.hh"
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
 #include "sim/eventq.hh"
+#include "sim/process.hh"
 #include "sim/serialize.hh"
+#include "sim/system.hh"
 
 class BaseCPU;
 
-#if FULL_SYSTEM
-
-#include "sim/system.hh"
 
 class FunctionProfile;
 class ProfileNode;
 class FunctionalPort;
 class PhysicalPort;
+class TranslatingPort;
 
 namespace TheISA {
     namespace Kernel {
@@ -67,14 +68,6 @@ namespace TheISA {
     };
 };
 
-#else // !FULL_SYSTEM
-
-#include "mem/page_table.hh"
-#include "sim/process.hh"
-class TranslatingPort;
-
-#endif // FULL_SYSTEM
-
 /**
  * The SimpleThread object provides a combination of the ThreadState
  * object and the ThreadContext interface. It implements the
@@ -184,15 +177,12 @@ class SimpleThread : public ThreadState
         dtb->demapPage(vaddr, asn);
     }
 
-#if FULL_SYSTEM
     void dumpFuncProfile();
 
     Fault hwrei();
 
     bool simPalCheck(int palFunc);
 
-#endif
-
     /*******************************************
      * ThreadContext interface functions.
      ******************************************/
@@ -382,12 +372,10 @@ class SimpleThread : public ThreadState
     void setStCondFailures(unsigned sc_failures)
     { storeCondFailures = sc_failures; }
 
-#if !FULL_SYSTEM
     void syscall(int64_t callnum)
     {
         process->syscall(callnum, tc);
     }
-#endif
 };
 
 
-- 
cgit v1.2.3