diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:17 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:17 -0500 |
| commit | 596cbe19d4591b900acc022ff5a38fc7ee9a5df7 (patch) | |
| tree | 9bdf5f7916a9a9188529f450d83543c65b294d6e /src | |
| parent | 6101e1b06276daf66e9c6c66523bb2339ccf47bf (diff) | |
| download | gem5-596cbe19d4591b900acc022ff5a38fc7ee9a5df7.tar.xz | |
ARM: Make sure undefined unconditional ARM instructions decode as such.
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/arm/isa/formats/uncond.isa | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/src/arch/arm/isa/formats/uncond.isa b/src/arch/arm/isa/formats/uncond.isa index 177b67ff2..8aa460081 100644 --- a/src/arch/arm/isa/formats/uncond.isa +++ b/src/arch/arm/isa/formats/uncond.isa @@ -235,34 +235,39 @@ def format ArmUnconditional() {{ return new BlxImm(machInst, imm); } case 0x2: - if (CPNUM == 0xa || CPNUM == 0xb) { - return decodeExtensionRegLoadStore(machInst); - } - if (bits(op1, 0) == 1) { - if (rn == INTREG_PC) { - if (bits(op1, 4, 3) != 0x0) { + if (bits(op1, 4, 0) != 0) { + if (CPNUM == 0xa || CPNUM == 0xb) { + return decodeExtensionRegLoadStore(machInst); + } + if (bits(op1, 0) == 1) { + if (rn == INTREG_PC) { + if (bits(op1, 4, 3) != 0x0) { + return new WarnUnimplemented( + "ldc, ldc2 (literal)", machInst); + } + } else { + if (op1 == 0xC3 || op1 == 0xC7) { + return new WarnUnimplemented( + "ldc, ldc2 (immediate)", machInst); + } + } + if (op1 == 0xC5) { return new WarnUnimplemented( - "ldc, ldc2 (literal)", machInst); + "mrrc, mrrc2", machInst); } } else { - if (op1 == 0xC3 || op1 == 0xC7) { + if (bits(op1, 4, 3) != 0 || bits(op1, 1) == 1) { + return new WarnUnimplemented( + "stc, stc2", machInst); + } else if (op1 == 0xC4) { return new WarnUnimplemented( - "ldc, ldc2 (immediate)", machInst); + "mcrr, mcrrc", machInst); } } - if (op1 == 0xC5) { - return new WarnUnimplemented("mrrc, mrrc2", machInst); - } - } else { - if (bits(op1, 4, 3) != 0 || bits(op1, 1) == 1) { - return new WarnUnimplemented("stc, stc2", machInst); - } else if (op1 == 0xC4) { - return new WarnUnimplemented("mcrr, mcrrc", machInst); - } } break; case 0x3: - { + if (bits(op1, 4) == 0) { if (CPNUM == 0xa || CPNUM == 0xb) { return decodeShortFpTransfer(machInst); } else if (CPNUM == 0xf) { |