diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-09-11 17:57:30 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-09-11 17:57:30 -0400 |
| commit | 44c6f953b0a448bd27b8354de90db8934b3ca799 (patch) | |
| tree | fb51f30f84c61e091a142dce3e1c30c689fd3826 /util | |
| parent | 9e6d12b0959544e0fad8f84644f2c6471a5ef272 (diff) | |
| parent | 46502851abffd70328ef605b1fa6056f873848e9 (diff) | |
| download | gem5-44c6f953b0a448bd27b8354de90db8934b3ca799.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : 14ac24236ff65b7e489c1ce4b4e9a295966013b8
Diffstat (limited to 'util')
| -rw-r--r-- | util/m5/m5op.S | 18 | ||||
| -rw-r--r-- | util/m5/m5op.h | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/util/m5/m5op.S b/util/m5/m5op.S index a55532c90..5c0212189 100644 --- a/util/m5/m5op.S +++ b/util/m5/m5op.S @@ -50,6 +50,8 @@ #define switchcpu_func 0x52 #define addsymbol_func 0x53 #define panic_func 0x54 +#define anbegin_func 0x55 +#define anwait_func 0x56 #define INST(op, ra, rb, func) \ .long (((op) << 26) | ((ra) << 21) | ((rb) << 16) | (func)) @@ -84,6 +86,8 @@ func: #define SWITCHCPU INST(m5_op, 0, 0, switchcpu_func) #define ADDSYMBOL(r1,r2) INST(m5_op, r1, r2, addsymbol_func) #define PANIC INST(m5_op, 0, 0, panic_func) +#define AN_BEGIN(r1) INST(m5_op, r1, 0, anbegin_func) +#define AN_WAIT(r1,r2) INST(m5_op, r1, r2, anwait_func) .set noreorder @@ -197,3 +201,17 @@ LEAF(m5_panic) END(m5_panic) + .align 4 +LEAF(m5_anbegin) + AN_BEGIN(16) + RET +END(m5_anbegin) + + + .align 4 +LEAF(m5_anwait) + AN_WAIT(16,17) + RET +END(m5_anwait) + + diff --git a/util/m5/m5op.h b/util/m5/m5op.h index f96c5097a..eab4e7fd5 100644 --- a/util/m5/m5op.h +++ b/util/m5/m5op.h @@ -53,5 +53,7 @@ void m5_debugbreak(void); void m5_switchcpu(void); void m5_addsymbol(uint64_t addr, char *symbol); void m5_panic(void); +void m5_anbegin(uint64_t s); +void m5_anwait(uint64_t s, uint64_t w); #endif // __M5OP_H__ |