From 3ca958cd19cb9bddfbfc7f9d5ee27c0ad07a2ea5 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Fri, 16 Sep 2011 22:29:48 +0000 Subject: Fix disassembly of Thumb2 BFI instructions with bit range of [0, 32). llvm-svn: 139964 --- llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp') diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 2818e77afc9..71cda57008c 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/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; } -- cgit v1.2.3