diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-02-23 01:05:33 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-02-23 01:05:33 +0000 |
| commit | 187cc99e4e2ed21af5904aaf840b2e2558d019bb (patch) | |
| tree | b8f459702504d9320214cb81b89befda2af10606 /src | |
| parent | a5b73a6e332c3f27ce29346229e1f91c04f53cf9 (diff) | |
| parent | 341a1eed6cf088b1f99b73780572cb3d2a09fd14 (diff) | |
| download | gem5-187cc99e4e2ed21af5904aaf840b2e2558d019bb.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-sparc32
--HG--
extra : convert_revision : a7697ea8457a03318e3fcf34775bf3ecc4786e8a
Diffstat (limited to 'src')
| -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 3684cda69..6c97ca76c 100644 --- a/src/arch/sparc/isa/decoder.isa +++ b/src/arch/sparc/isa/decoder.isa @@ -1012,13 +1012,15 @@ decode OP default Unknown::unknown() #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;}}); |