Ali and I both made the same change and we only need it once. I liked mine a little...

--HG--
extra : convert_revision : 3a1b7856e6143ca089fd6e36492608377dfede19

diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa
index 6c97ca76cee35f1fd7c517e3db35c45d7f0807b2..2ce700ef119970bd3c576c95cdf0ad90748a1f2f 100644 (file)
--- a/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@ -1009,7 +1009,6 @@ decode OP default Unknown::unknown()
                 0x80: Trap::shutdown({{fault = new IllegalInstruction;}});
                 0x81: FailUnimpl::siam();
             }
-#if FULL_SYSTEM
             // M5 special opcodes use the reserved IMPDEP2A opcode space
             0x37: decode M5FUNC {
 #if FULL_SYSTEM
@@ -1022,9 +1021,6 @@ decode OP default Unknown::unknown()
 #endif
                 default: Trap::impdep2({{fault = new IllegalInstruction;}});
             }
-#else
-            0x37: Trap::impdep2({{fault = new IllegalInstruction;}});
-#endif
             0x38: Branch::jmpl({{
                 Addr target = Rs1 + Rs2_or_imm13;
                 if(target & 0x3)