From 1473f35c47658775e3a9ec23da2a47ff0ef79ac4 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 3 Mar 2011 07:19:52 +0000 Subject: [PATCH] TableGen should not ignore BX instructions for the ARM disassembler. pr9368. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126931 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/MC/Disassembler/ARM/arm-tests.txt | 3 +++ utils/TableGen/ARMDecoderEmitter.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/MC/Disassembler/ARM/arm-tests.txt b/test/MC/Disassembler/ARM/arm-tests.txt index 197b9b04a3c..d707565894b 100644 --- a/test/MC/Disassembler/ARM/arm-tests.txt +++ b/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/utils/TableGen/ARMDecoderEmitter.cpp b/utils/TableGen/ARMDecoderEmitter.cpp index cec6b9abd06..a2403e6a1d5 100644 --- a/utils/TableGen/ARMDecoderEmitter.cpp +++ b/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;