1 files changed, 31 insertions, 27 deletions
diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 93021abad..30996fc3b 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -33,31 +33,35 @@ class ThreadContext;
 //We need the "Tick" and "Addr" data types from here
 #include "sim/host.hh"
 
-namespace PseudoInst
-{
-    /**
-     * @todo these externs are only here for a hack in fullCPU::takeOver...
-     */
-    extern bool doStatisticsInsts;
-    extern bool doCheckpointInsts;
-    extern bool doQuiesce;
+namespace PseudoInst {
 
-    void arm(ThreadContext *tc);
-    void quiesce(ThreadContext *tc);
-    void quiesceNs(ThreadContext *tc, uint64_t ns);
-    void quiesceCycles(ThreadContext *tc, uint64_t cycles);
-    uint64_t quiesceTime(ThreadContext *tc);
-    void m5exit(ThreadContext *tc, Tick delay);
-    void m5exit_old(ThreadContext *tc);
-    void loadsymbol(ThreadContext *xc);
-    void resetstats(ThreadContext *tc, Tick delay, Tick period);
-    void dumpstats(ThreadContext *tc, Tick delay, Tick period);
-    void dumpresetstats(ThreadContext *tc, Tick delay, Tick period);
-    void m5checkpoint(ThreadContext *tc, Tick delay, Tick period);
-    uint64_t readfile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset);
-    void debugbreak(ThreadContext *tc);
-    void switchcpu(ThreadContext *tc);
-    void addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr);
-    void anBegin(ThreadContext *tc, uint64_t cur);
-    void anWait(ThreadContext *tc, uint64_t cur, uint64_t wait);
-}
+/**
+ * @todo these externs are only here for a hack in fullCPU::takeOver...
+ */
+extern bool doStatisticsInsts;
+extern bool doCheckpointInsts;
+extern bool doQuiesce;
+
+#if FULL_SYSTEM
+void arm(ThreadContext *tc);
+void quiesce(ThreadContext *tc);
+void quiesceNs(ThreadContext *tc, uint64_t ns);
+void quiesceCycles(ThreadContext *tc, uint64_t cycles);
+uint64_t quiesceTime(ThreadContext *tc);
+uint64_t readfile(ThreadContext *tc, Addr vaddr, uint64_t len,
+    uint64_t offset);
+void loadsymbol(ThreadContext *xc);
+void addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr);
+#endif
+
+uint64_t rpns(ThreadContext *tc);
+void wakeCPU(ThreadContext *tc, uint64_t cpuid);
+void m5exit(ThreadContext *tc, Tick delay);
+void resetstats(ThreadContext *tc, Tick delay, Tick period);
+void dumpstats(ThreadContext *tc, Tick delay, Tick period);
+void dumpresetstats(ThreadContext *tc, Tick delay, Tick period);
+void m5checkpoint(ThreadContext *tc, Tick delay, Tick period);
+void debugbreak(ThreadContext *tc);
+void switchcpu(ThreadContext *tc);
+
+/* namespace PseudoInst */ }