Merge zizzer.eecs.umich.edu:/bk/newmem

into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-sparc32

--HG--
extra : convert_revision : a7697ea8457a03318e3fcf34775bf3ecc4786e8a

diff --cc src/arch/sparc/isa/decoder.isa
index 3684cda69441d0e4049652569e73106cc784afb6,2ce700ef119970bd3c576c95cdf0ad90748a1f2f..6c97ca76cee35f1fd7c517e3db35c45d7f0807b2
--- 1/src/arch/sparc/isa/decoder.isa
--- 2/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@@ -1009,20 -1009,18 +1009,22 @@@ 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
                  // we have 7 bits of space here to play with...
                  0x21: m5exit({{PseudoInst::m5exit(xc->tcBase(), O0);
                                }}, No_OpClass, IsNonSpeculative);
                  0x54: m5panic({{
                                panic("M5 panic instruction called at pc=%#x.", xc->readPC());
                                }}, No_OpClass, IsNonSpeculative);
- 
+ #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)