Compilation fixes

--HG--
extra : convert_revision : 974e91a960251a35d5ebb76c7e6c7ac330339896

diff --git a/src/cpu/o3/sparc/cpu.hh b/src/cpu/o3/sparc/cpu.hh
index 73c85936745673b77085c6e5c5ad82193dcfa302..08ebd271080a980c564c929d5705d0c55e062782 100644 (file)
--- a/src/cpu/o3/sparc/cpu.hh
+++ b/src/cpu/o3/sparc/cpu.hh
@@ -128,6 +128,24 @@ class SparcO3CPU : public FullO3CPU<Impl>
      */
     void squashFromTC(unsigned tid);
 
+#if FULL_SYSTEM
+    /** Posts an interrupt. */
+    void post_interrupt(int int_num, int index);
+    /** HW return from error interrupt. */
+    Fault hwrei(unsigned tid);
+
+    bool simPalCheck(int palFunc, unsigned tid);
+
+    /** Returns the Fault for any valid interrupt. */
+    Fault getInterrupts();
+
+    /** Processes any an interrupt fault. */
+    void processInterrupts(Fault interrupt);
+
+    /** Halts the CPU. */
+    void halt() { panic("Halt not implemented!\n"); }
+#endif
+
     /** Traps to handle given fault. */
     void trap(Fault fault, unsigned tid);
 

diff --git a/src/cpu/o3/sparc/cpu_builder.cc b/src/cpu/o3/sparc/cpu_builder.cc
index 81f419ee05f1075e8084137be007b1e4f0a14810..3cac89bad29fc51dd84b34900544db71d5fee160 100644 (file)
--- a/src/cpu/o3/sparc/cpu_builder.cc
+++ b/src/cpu/o3/sparc/cpu_builder.cc
@@ -55,8 +55,8 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(DerivO3CPU)
 #if FULL_SYSTEM
     SimObjectParam<System *> system;
     Param<int> cpu_id;
-    SimObjectParam<AlphaISA::ITB *> itb;
-    SimObjectParam<AlphaISA::DTB *> dtb;
+    SimObjectParam<SparcISA::ITB *> itb;
+    SimObjectParam<SparcISA::DTB *> dtb;
     Param<Tick> profile;
 
     Param<bool> do_quiesce;

diff --git a/src/cpu/o3/sparc/dyn_inst_impl.hh b/src/cpu/o3/sparc/dyn_inst_impl.hh
index daf93d4a8fb05347443350b61e34ac486dd8145b..b830ee7bd44c5beb9f2f451547e630d969891f64 100644 (file)
--- a/src/cpu/o3/sparc/dyn_inst_impl.hh
+++ b/src/cpu/o3/sparc/dyn_inst_impl.hh
@@ -126,7 +126,8 @@ template <class Impl>
 bool
 SparcDynInst<Impl>::simPalCheck(int palFunc)
 {
-    return this->cpu->simPalCheck(palFunc, this->threadNumber);
+    panic("simPalCheck called, but there's no PAL in SPARC!\n");
+    return false;
 }
 #else
 template <class Impl>

diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh
index 0849001e8c254029786fd7e2354f4cae1a64845d..4987d6eb43911fbd4fdac684784423035a4c3388 100755 (executable)
--- a/src/cpu/o3/thread_context.hh
+++ b/src/cpu/o3/thread_context.hh
@@ -68,10 +68,10 @@ class O3ThreadContext : public ThreadContext
 
 #if FULL_SYSTEM
     /** Returns a pointer to the ITB. */
-    virtual AlphaISA::ITB *getITBPtr() { return cpu->itb; }
+    TheISA::ITB *getITBPtr() { return cpu->itb; }
 
     /** Returns a pointer to the DTB. */
-    virtual AlphaISA::DTB *getDTBPtr() { return cpu->dtb; }
+    TheISA::DTB *getDTBPtr() { return cpu->dtb; }
 #endif
 
     /** Returns a pointer to this CPU. */