Merge zizzer.eecs.umich.edu:/bk/newmem

[gem5.git] / src / sim / pseudo_inst.hh

diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 5e5b7d95ff2a26d8c37f898d5bee0d7c66ecc0b6..d211de44e28b3f6d3614516b00d4988ff6aedd57 100644 (file)
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -30,10 +30,8 @@
 
 class ThreadContext;
 
-//We need the "Tick" data type from here
+//We need the "Tick" and "Addr" data types from here
 #include "sim/host.hh"
-//We need the "Addr" data type from here
-#include "arch/isa_traits.hh"
 
 namespace AlphaPseudo
 {
@@ -53,6 +51,7 @@ namespace AlphaPseudo
     void ivle(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);
@@ -61,4 +60,6 @@ namespace AlphaPseudo
     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);
 }