diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-06-09 17:47:23 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-06-09 17:47:23 -0400 |
| commit | f8df550db826c9fe29cc184fce873db6789e42ee (patch) | |
| tree | 96aa51eef059ef3740c5e67459682f4256a95812 /src/arch/mips/isa/formats/noop.isa | |
| parent | caca57421b32410f6ff1356ae75684891337073f (diff) | |
| parent | b94fecfa10236b51ded904a5f1a57f4a5ebe7acc (diff) | |
| download | gem5-f8df550db826c9fe29cc184fce873db6789e42ee.tar.xz | |
Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release
--HG--
extra : convert_revision : 82b83199a36059d4b402f89f7db2de299ea59c1e
Diffstat (limited to 'src/arch/mips/isa/formats/noop.isa')
| -rw-r--r-- | src/arch/mips/isa/formats/noop.isa | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/arch/mips/isa/formats/noop.isa b/src/arch/mips/isa/formats/noop.isa index 2aa4816e3..a1a80fc56 100644 --- a/src/arch/mips/isa/formats/noop.isa +++ b/src/arch/mips/isa/formats/noop.isa @@ -36,11 +36,7 @@ output decoder {{ std::string Nop::generateDisassembly(Addr pc, const SymbolTable *symtab) const { -#ifdef SS_COMPATIBLE_DISASSEMBLY - return originalDisassembly; -#else - return csprintf("%-10s (%s)", "nop", originalDisassembly); -#endif + return csprintf("%-10s %s", "nop", originalDisassembly); } /// Helper function for decoding nops. Substitute Nop object @@ -89,6 +85,6 @@ def format BasicOperateWithNopCheck(code, *opt_args) {{ }}; def format Nop() {{ - decode_block = 'return new Nop(\"sll r0,r0,0\",machInst);\n' + decode_block = 'return new Nop(\"\",machInst);\n' }}; |