diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-11-10 12:44:15 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-11-10 12:44:15 -0500 |
| commit | b5e68fb54677f601bb00c23af52db8fd6571301f (patch) | |
| tree | dc3c17198ba4010d907ecd8cb7189aa7959948d4 /util | |
| parent | 264f9ce374ff4689fec3c32d8289fe76b0b65078 (diff) | |
| parent | 9ef51f2dbaba88c10366d708f0ca872bb39064e4 (diff) | |
| download | gem5-b5e68fb54677f601bb00c23af52db8fd6571301f.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem
--HG--
extra : convert_revision : 0c2db1e1b5fdb91c1ac5705ab872a6bfb575a67a
Diffstat (limited to 'util')
| -rw-r--r-- | util/m5/m5.c | 4 | ||||
| -rw-r--r-- | util/m5/m5op.S | 17 | ||||
| -rw-r--r-- | util/m5/m5op.h | 2 |
3 files changed, 1 insertions, 22 deletions
diff --git a/util/m5/m5.c b/util/m5/m5.c index 23401aea5..ca555ed12 100644 --- a/util/m5/m5.c +++ b/util/m5/m5.c @@ -41,9 +41,7 @@ char *progname; void usage() { - printf("usage: m5 ivlb <interval>\n" - " m5 ivle <interval>\n" - " m5 initparam\n" + printf("usage: m5 initparam\n" " m5 sw99param\n" " m5 exit [delay]\n" " m5 resetstats [delay [period]]\n" diff --git a/util/m5/m5op.S b/util/m5/m5op.S index a19113e62..c47bd15b0 100644 --- a/util/m5/m5op.S +++ b/util/m5/m5op.S @@ -36,8 +36,6 @@ #define quiescens_func 0x02 #define quiescecycle_func 0x03 #define quiescetime_func 0x04 -#define ivlb_func 0x10 -#define ivle_func 0x11 #define exit_old_func 0x20 // deprectated! #define exit_func 0x21 #define initparam_func 0x30 @@ -74,8 +72,6 @@ func: #define QUIESCENS(r1) INST(m5_op, r1, 0, quiescens_func) #define QUIESCECYC(r1) INST(m5_op, r1, 0, quiescecycle_func) #define QUIESCETIME INST(m5_op, 0, 0, quiescetime_func) -#define IVLB(reg) INST(m5_op, reg, 0, ivlb_func) -#define IVLE(reg) INST(m5_op, reg, 0, ivle_func) #define M5EXIT(reg) INST(m5_op, reg, 0, exit_func) #define INITPARAM(reg) INST(m5_op, reg, 0, initparam_func) #define LOADSYMBOL(reg) INST(m5_op, reg, 0, loadsymbol_func) @@ -123,19 +119,6 @@ LEAF(quiesceTime) RET END(quiesceTime) - - .align 4 -LEAF(m5_ivlb) - IVLB(16) - RET -END(m5_ivlb) - - .align 4 -LEAF(m5_ivle) - IVLE(16) - RET -END(m5_ivle) - .align 4 LEAF(m5_exit) M5EXIT(16) diff --git a/util/m5/m5op.h b/util/m5/m5op.h index eab4e7fd5..e8f2baaac 100644 --- a/util/m5/m5op.h +++ b/util/m5/m5op.h @@ -40,8 +40,6 @@ void quiesceNs(uint64_t ns); void quiesceCycle(uint64_t cycles); uint64_t quiesceTime(void); -void m5_ivlb(uint64_t interval); -void m5_ivle(uint64_t interval); void m5_exit(uint64_t ns_delay); uint64_t m5_initparam(void); void m5_checkpoint(uint64_t ns_delay, uint64_t ns_period); |