diff options
author | Owen Anderson <resistor@mac.com> | 2011-09-16 22:29:48 +0000 |
---|---|---|
committer | Owen Anderson <resistor@mac.com> | 2011-09-16 22:29:48 +0000 |
commit | 89db0f690c3238544e59ea3bf2b7a0d6bc8a6544 (patch) | |
tree | 93bd263ce437d4f2b0b045c20584213a789aaba0 /lib/Target/ARM/Disassembler/ARMDisassembler.cpp | |
parent | 47313df81c096005dbbe8dbe729375f7d0bb3e15 (diff) |
Fix disassembly of Thumb2 BFI instructions with bit range of [0, 32).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139964 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
-rw-r--r-- | lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 2818e77afc..71cda57008 100644 --- a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -1003,8 +1003,12 @@ static DecodeStatus DecodeBitfieldMaskOperand(llvm::MCInst &Inst, unsigned Val, // create the final mask. unsigned msb = fieldFromInstruction32(Val, 5, 5); unsigned lsb = fieldFromInstruction32(Val, 0, 5); + uint32_t msb_mask = (1 << (msb+1)) - 1; + if (msb == 31) msb_mask = 0xFFFFFFFF; uint32_t lsb_mask = (1 << lsb) - 1; + if (lsb == 31) lsb_mask = 0xFFFFFFFF; + Inst.addOperand(MCOperand::CreateImm(~(msb_mask ^ lsb_mask))); return MCDisassembler::Success; } |