diff options
| author | Kevin Enderby <enderby@apple.com> | 2012-11-29 23:47:11 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2012-11-29 23:47:11 +0000 |
| commit | 136d6746c58fe3ab431e2279289646769918a48f (patch) | |
| tree | d2a9631d5e2c62d365cee1169af2a0183397db59 | |
| parent | a92db6773ad6054317a7f72a16e319eddd6d7edf (diff) | |
| download | bcm5719-llvm-136d6746c58fe3ab431e2279289646769918a48f.tar.gz bcm5719-llvm-136d6746c58fe3ab431e2279289646769918a48f.zip | |
Fixed the arm disassembly of invalid BFI instructions to not build a bad MCInst
which would then cause an assert when printed. rdar://11437956
llvm-svn: 168960
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 8 | ||||
| -rw-r--r-- | llvm/test/MC/Disassembler/ARM/unpredictable-BFI.txt | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index f00142de50d..5de50d592e7 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -1281,7 +1281,13 @@ static DecodeStatus DecodeBitfieldMaskOperand(MCInst &Inst, unsigned Val, unsigned lsb = fieldFromInstruction(Val, 0, 5); DecodeStatus S = MCDisassembler::Success; - if (lsb > msb) Check(S, MCDisassembler::SoftFail); + if (lsb > msb) { + Check(S, MCDisassembler::SoftFail); + // The check above will cause the warning for the "potentially undefined + // instruction encoding" but we can't build a bad MCOperand value here + // with a lsb > msb or else printing the MCInst will cause a crash. + lsb = msb; + } uint32_t msb_mask = 0xFFFFFFFF; if (msb != 31) msb_mask = (1U << (msb+1)) - 1; diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-BFI.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-BFI.txt new file mode 100644 index 00000000000..a98f859c4c6 --- /dev/null +++ b/llvm/test/MC/Disassembler/ARM/unpredictable-BFI.txt @@ -0,0 +1,11 @@ +# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s + +# rdar://11437956 + +# CHECK: warning: invalid instruction encoding +# CHECK: 0x90 0x00 0xc0 0xe7 +0x90 0x00 0xc0 0xe7 + +# CHECK: warning: invalid instruction encoding +# CHECK: 0x90 0x01 0xc0 0xe7 +0x90 0x01 0xc0 0xe7 |
