diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-02-22 13:18:23 +0000 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-02-22 13:18:23 +0000 |
commit | 341a1eed6cf088b1f99b73780572cb3d2a09fd14 (patch) | |
tree | 2d32eb28a3bacf632aabb5bc1c42c9f299447891 /src/arch/sparc/isa | |
parent | c003dda793b5cc6fb9d9953fa1477849ddc42944 (diff) | |
parent | 34b4722aeeb5abdf34c3e90365411297884680fe (diff) | |
download | gem5-341a1eed6cf088b1f99b73780572cb3d2a09fd14.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-sparc32
--HG--
extra : convert_revision : 70dcd9d1d669c1c619411389487b7910861550e3
Diffstat (limited to 'src/arch/sparc/isa')
-rw-r--r-- | src/arch/sparc/isa/decoder.isa | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa index e2d1707dd..2ce700ef1 100644 --- a/src/arch/sparc/isa/decoder.isa +++ b/src/arch/sparc/isa/decoder.isa @@ -1011,13 +1011,15 @@ decode OP default Unknown::unknown() } // 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;}}); } 0x38: Branch::jmpl({{ Addr target = Rs1 + Rs2_or_imm13; |