diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2011-03-03 07:19:52 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2011-03-03 07:19:52 +0000 |
| commit | 1473f35c47658775e3a9ec23da2a47ff0ef79ac4 (patch) | |
| tree | 49c2071401f4f1783b7a7db84d949eeffaa50c9a | |
| parent | acc9e7315c450ca7cffd4a65c65e578211f9d945 (diff) | |
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
| -rw-r--r-- | test/MC/Disassembler/ARM/arm-tests.txt | 3 | ||||
| -rw-r--r-- | utils/TableGen/ARMDecoderEmitter.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/MC/Disassembler/ARM/arm-tests.txt b/test/MC/Disassembler/ARM/arm-tests.txt index 197b9b04a3..d707565894 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 cec6b9abd0..a2403e6a1d 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; |