syscall: Resolve conflicts between m5threads and Gabe's recent SE changes.

[gem5.git] / src / arch / sparc / interrupts.hh

diff --git a/src/arch/sparc/interrupts.hh b/src/arch/sparc/interrupts.hh
index 66b3792b5b30432d79666459968eb3714d6aa4e5..ec930e2b045776bb8bb3d8e32821e180bc084ebb 100644 (file)
--- a/src/arch/sparc/interrupts.hh
+++ b/src/arch/sparc/interrupts.hh
@@ -43,12 +43,20 @@ namespace SparcISA
 
 class Interrupts : public SimObject
 {
-
   private:
+    BaseCPU * cpu;
+
     uint64_t interrupts[NumInterruptTypes];
     uint64_t intStatus;
 
   public:
+
+    void
+    setCPU(BaseCPU * _cpu)
+    {
+        cpu = _cpu;
+    }
+
     typedef SparcInterruptsParams Params;
 
     const Params *
@@ -57,7 +65,7 @@ class Interrupts : public SimObject
         return dynamic_cast<const Params *>(_params);
     }
 
-    Interrupts(Params * p) : SimObject(p)
+    Interrupts(Params * p) : SimObject(p), cpu(NULL)
     {
         clearAll();
     }