diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-22 01:15:16 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-22 01:15:16 -0500 |
commit | b750d6a597cea8fa1671a7397dd38c3c932a28c3 (patch) | |
tree | 63d9ae27c14ada1356165ba085354389609f2435 /src/arch | |
parent | fa4c3d74fe7eb9627119d17542fbde18eb10423e (diff) | |
parent | 63fef6b011fc2684a9ef04543c422a442df99932 (diff) | |
download | gem5-b750d6a597cea8fa1671a7397dd38c3c932a28c3.tar.xz |
Merge zizzer:/bk/newmem
into pb15.local:/Users/ali/work/m5.newmem
--HG--
extra : convert_revision : e0057583132ce545eb1867b446484e8984b97282
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/sparc/isa/decoder.isa | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa index e2d1707dd..3684cda69 100644 --- a/src/arch/sparc/isa/decoder.isa +++ b/src/arch/sparc/isa/decoder.isa @@ -1009,6 +1009,7 @@ 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 { // we have 7 bits of space here to play with... @@ -1019,6 +1020,9 @@ decode OP default Unknown::unknown() }}, No_OpClass, IsNonSpeculative); } +#else + 0x37: Trap::impdep2({{fault = new IllegalInstruction;}}); +#endif 0x38: Branch::jmpl({{ Addr target = Rs1 + Rs2_or_imm13; if(target & 0x3) |