[llvm] r184702 - ARM: fix IT decoding

[Amaury de la Vieuville]

Author: amaury.dlv
Date: Mon Jun 24 04:11:45 2013
New Revision: 184702

URL: http://llvm.org/viewvc/llvm-project?rev=184702&view=rev
Log:
ARM: fix IT decoding

mask == 0 -> UNPRED

Modified:
    llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
    llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.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=184702&r1=184701&r2=184702&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp Mon Jun 24 04:11:45 2013
@@ -4667,10 +4667,8 @@ static DecodeStatus DecodeIT(MCInst &Ins
     S = MCDisassembler::SoftFail;
   }
 
-  if (mask == 0x0) {
-    mask |= 0x8;
-    S = MCDisassembler::SoftFail;
-  }
+  if (mask == 0x0)
+    return MCDisassembler::Fail;
 
   Inst.addOperand(MCOperand::CreateImm(pred));
   Inst.addOperand(MCOperand::CreateImm(mask));

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt?rev=184702&r1=184701&r2=184702&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt Mon Jun 24 04:11:45 2013
@@ -1,3 +1,7 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-unknown-unknown 2>&1 | grep "potentially undefined instruction encoding"
+# CHECK-UNPRED: potentially undefined instruction encoding
+# CHECK-UNDEF: invalid instruction encoding
 
-0xff 0xbf 0x6b 0x80 0x00 0x75
+# RUN: echo "0xff 0xbf 0x6b 0x80 0x00 0x75" | llvm-mc -disassemble -triple thumbv7 2>&1 | FileCheck %s --check-prefix=CHECK-UNPRED
+
+# mask = 0
+# RUN: echo "0x50 0xbf 0x00 0x00" | llvm-mc -disassemble -triple thumbv7 2>&1 | FileCheck %s --check-prefix=CHECK-UNDEF