[llvm-commits] [llvm] r139964 - in /llvm/trunk: lib/Target/ARM/Disassembler/ARMDisassembler.cpp test/MC/Disassembler/ARM/thumb2.txt

[Owen Anderson]

Author: resistor
Date: Fri Sep 16 17:29:48 2011
New Revision: 139964

URL: http://llvm.org/viewvc/llvm-project?rev=139964&view=rev
Log:
Fix disassembly of Thumb2 BFI instructions with bit range of [0, 32).

Modified:
    llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
    llvm/trunk/test/MC/Disassembler/ARM/thumb2.txt

Modified: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp?rev=139964&r1=139963&r2=139964&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp Fri Sep 16 17:29:48 2011
@@ -1003,8 +1003,12 @@
   // 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;
 }

Modified: llvm/trunk/test/MC/Disassembler/ARM/thumb2.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/thumb2.txt?rev=139964&r1=139963&r2=139964&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/thumb2.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/thumb2.txt Fri Sep 16 17:29:48 2011
@@ -186,10 +186,12 @@
 # CHECK: bfi r5, r2, #3, #17
 # CHECK: it ne
 # CHECK: bfine r5, r2, #3, #17
+# CHECK: bfi r6, r0, #0, #32
 
 0x62 0xf3 0xd3 0x05
 0x18 0xbf
 0x62 0xf3 0xd3 0x05
+0x60 0xf3 0x1f 0x06
 
 
 #------------------------------------------------------------------------------