summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorBob Wilson <bob.wilson@apple.com>2011-03-03 07:19:52 +0000
committerBob Wilson <bob.wilson@apple.com>2011-03-03 07:19:52 +0000
commit6f6d739b6ee627cc194930f528ddd1d62dde6450 (patch)
tree59e14c62c2be406d84268446667074f4db5adcd0 /llvm
parentab8881accd147ff3a3d699df278664e90d467bb4 (diff)
downloadbcm5719-llvm-6f6d739b6ee627cc194930f528ddd1d62dde6450.tar.gz
bcm5719-llvm-6f6d739b6ee627cc194930f528ddd1d62dde6450.zip
TableGen should not ignore BX instructions for the ARM disassembler. pr9368.
llvm-svn: 126931
Diffstat (limited to 'llvm')
-rw-r--r--llvm/test/MC/Disassembler/ARM/arm-tests.txt3
-rw-r--r--llvm/utils/TableGen/ARMDecoderEmitter.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/llvm/test/MC/Disassembler/ARM/arm-tests.txt b/llvm/test/MC/Disassembler/ARM/arm-tests.txt
index 197b9b04a3c..d707565894b 100644
--- a/llvm/test/MC/Disassembler/ARM/arm-tests.txt
+++ b/llvm/test/MC/Disassembler/ARM/arm-tests.txt
@@ -136,3 +136,6 @@
# CHECK: blxeq r5
0x35 0xff 0x2f 0x01
+
+# CHECK: bx r12
+0x1c 0xff 0x2f 0xe1
diff --git a/llvm/utils/TableGen/ARMDecoderEmitter.cpp b/llvm/utils/TableGen/ARMDecoderEmitter.cpp
index cec6b9abd06..a2403e6a1d5 100644
--- a/llvm/utils/TableGen/ARMDecoderEmitter.cpp
+++ b/llvm/utils/TableGen/ARMDecoderEmitter.cpp
@@ -1631,7 +1631,7 @@ ARMDEBackend::populateInstruction(const CodeGenInstruction &CGI,
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;
OpenPOWER on IntegriCloud