diff options
| author | Owen Anderson <resistor@mac.com> | 2011-09-16 23:30:01 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2011-09-16 23:30:01 +0000 |
| commit | 502cd9d87ac640e96704464ca5686ca72e053698 (patch) | |
| tree | 5cd3c5fa4707c7e574114a65fee504b3a02d4c38 /llvm/lib/Target/ARM/Disassembler | |
| parent | 2f55019bf0f229d5b66938618497ade2c35091ee (diff) | |
| download | bcm5719-llvm-502cd9d87ac640e96704464ca5686ca72e053698.tar.gz bcm5719-llvm-502cd9d87ac640e96704464ca5686ca72e053698.zip | |
Bitfield mask instructions are unpredictable if the encoded LSB is higher than the encoded MSB.
llvm-svn: 139972
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler')
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 4e9c3e58a5f..d76fb93d156 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -1004,12 +1004,15 @@ static DecodeStatus DecodeBitfieldMaskOperand(llvm::MCInst &Inst, unsigned Val, unsigned msb = fieldFromInstruction32(Val, 5, 5); unsigned lsb = fieldFromInstruction32(Val, 0, 5); + DecodeStatus S = MCDisassembler::Success; + if (lsb > msb) Check(S, MCDisassembler::SoftFail); + uint32_t msb_mask = 0xFFFFFFFF; if (msb != 31) msb_mask = (1U << (msb+1)) - 1; uint32_t lsb_mask = (1U << lsb) - 1; Inst.addOperand(MCOperand::CreateImm(~(msb_mask ^ lsb_mask))); - return MCDisassembler::Success; + return S; } static DecodeStatus DecodeCopMemInstruction(llvm::MCInst &Inst, unsigned Insn, |
