diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
| commit | 67732a7b2816929e41a52998c25eb008217041a5 (patch) | |
| tree | e4f51373195cab0f88e7f727d3837255a6909614 /arch/mips/isa/formats/noop.isa | |
| parent | 4d44e53736507de176e48cbf99b064ffa0ae5a7a (diff) | |
| parent | 0df85fd8d8b7a8c8d11b1b3da5b6277e4a5e54ec (diff) | |
| download | gem5-67732a7b2816929e41a52998c25eb008217041a5.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
SCCS merged
--HG--
extra : convert_revision : 38889011ea02005c8fd3a7f3b0be3395223f6166
Diffstat (limited to 'arch/mips/isa/formats/noop.isa')
| -rw-r--r-- | arch/mips/isa/formats/noop.isa | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/isa/formats/noop.isa b/arch/mips/isa/formats/noop.isa index 05c5ac10f..d35179005 100644 --- a/arch/mips/isa/formats/noop.isa +++ b/arch/mips/isa/formats/noop.isa @@ -59,7 +59,7 @@ output exec {{ Fault Nop::execute(%(CPU_exec_context)s *, Trace::InstRecord *) const { - return No_Fault; + return NoFault; } }}; @@ -68,9 +68,11 @@ output exec {{ def template OperateNopCheckDecode {{ { MipsStaticInst *i = new %(class_name)s(machInst); - if (RD == 0) { - i = makeNop(i); - } + + //if (RD == 0) { + // i = makeNop(i); + //} + return i; } }}; |