diff options
| -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 197b9b0..d707565 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 cec6b9a..a2403e6 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; |