SE/FS: Build the Interrupt objects in SE mode.

1 files changed, 5 insertions, 9 deletions

diff --git a/src/cpu/base.hh b/src/cpu/base.hh
index ce02889f3..9c75539b1 100644
--- a/src/cpu/base.hh
+++ b/src/cpu/base.hh
@@ -36,6 +36,7 @@
 
 #include <vector>
 
+#include "arch/interrupts.hh"
 #include "arch/isa_traits.hh"
 #include "arch/microcode_rom.hh"
 #include "base/statistics.hh"
@@ -45,10 +46,6 @@
 #include "sim/eventq.hh"
 #include "sim/insttracer.hh"
 
-#if FULL_SYSTEM
-#include "arch/interrupts.hh"
-#endif
-
 class BaseCPUParams;
 class BranchPred;
 class CheckerCPU;
@@ -125,7 +122,6 @@ class BaseCPU : public MemObject
 
     TheISA::MicrocodeRom microcodeRom;
 
-#if FULL_SYSTEM
   protected:
     TheISA::Interrupts *interrupts;
 
@@ -136,13 +132,17 @@ class BaseCPU : public MemObject
         return interrupts;
     }
 
+#if FULL_SYSTEM
     virtual void wakeup() = 0;
+#endif
 
     void
     postInterrupt(int int_num, int index)
     {
         interrupts->post(int_num, index);
+#if FULL_SYSTEM
         wakeup();
+#endif
     }
 
     void
@@ -174,7 +174,6 @@ class BaseCPU : public MemObject
         void process();
     };
     ProfileEvent *profileEvent;
-#endif
 
   protected:
     std::vector<ThreadContext *> threadContexts;
@@ -257,7 +256,6 @@ class BaseCPU : public MemObject
 
     Tick phase;
 
-#if FULL_SYSTEM
     /**
      * Serialize this object to the given output stream.
      * @param os The stream to serialize to.
@@ -271,8 +269,6 @@ class BaseCPU : public MemObject
      */
     virtual void unserialize(Checkpoint *cp, const std::string &section);
 
-#endif
-
     /**
      * Return pointer to CPU's branch predictor (NULL if none).
      * @return Branch predictor pointer.