From 6f6d739b6ee627cc194930f528ddd1d62dde6450 Mon Sep 17 00:00:00 2001
From: Bob Wilson <bob.wilson@apple.com>
Date: Thu, 3 Mar 2011 07:19:52 +0000
Subject: [PATCH] TableGen should not ignore BX instructions for the ARM
 disassembler. pr9368.

llvm-svn: 126931
---
 llvm/test/MC/Disassembler/ARM/arm-tests.txt | 3 +++
 llvm/utils/TableGen/ARMDecoderEmitter.cpp   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/llvm/test/MC/Disassembler/ARM/arm-tests.txt b/llvm/test/MC/Disassembler/ARM/arm-tests.txt
index 197b9b04a3cf..d707565894b4 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 cec6b9abd06b..a2403e6a1d52 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;