[llvm-commits] [llvm] r126931 - in /llvm/trunk: test/MC/Disassembler/ARM/arm-tests.txt utils/TableGen/ARMDecoderEmitter.cpp

[Bob Wilson]

Author: bwilson
Date: Thu Mar  3 01:19:52 2011
New Revision: 126931

URL: http://llvm.org/viewvc/llvm-project?rev=126931&view=rev
Log:
TableGen should not ignore BX instructions for the ARM disassembler. pr9368.

Modified:
    llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt
    llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp

Modified: llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt?rev=126931&r1=126930&r2=126931&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt Thu Mar  3 01:19:52 2011
@@ -136,3 +136,6 @@
 
 # CHECK: blxeq r5
 0x35 0xff 0x2f 0x01
+
+# CHECK: bx r12
+0x1c 0xff 0x2f 0xe1

Modified: llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp?rev=126931&r1=126930&r2=126931&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp Thu Mar  3 01:19:52 2011
@@ -1631,7 +1631,7 @@
     if (Name == "B") return false;
 
     // Ignore the non-Darwin BL instructions and the TPsoft (TLS) instruction.
-    if (Name == "BL" || Name == "BL_pred" || Name == "BLX" || Name == "BX" ||
+    if (Name == "BL" || Name == "BL_pred" || Name == "BLX" ||
         Name == "BLX_pred" || Name == "TPsoft")
       return false;