From: Johnny Chen <johnny.chen@apple.com>
Date: Fri, 25 Mar 2011 00:17:42 +0000 (+0000)
Subject: delegate the disassembly of t2ADR to the more generic t2ADDri12/t2SUBri12 instruction... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ef74e9ab409bd75c3679caae72bf233aa1faae49;p=oota-llvm.git

delegate the disassembly of t2ADR to the more generic t2ADDri12/t2SUBri12 instructions, and add a test case for that.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128249 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/MC/Disassembler/ARM/thumb-tests.txt b/test/MC/Disassembler/ARM/thumb-tests.txt
index ae28082deca..22b1da792b6 100644
--- a/test/MC/Disassembler/ARM/thumb-tests.txt
+++ b/test/MC/Disassembler/ARM/thumb-tests.txt
@@ -148,3 +148,6 @@
 
 # CHECK:	ldmia	r5!, {r0, r1, r2, r3, r4}
 0x1f 0xcd
+
+# CHECK:	addw	r0, pc, #1050
+0x0f 0xf2 0x1a 0x40
diff --git a/utils/TableGen/ARMDecoderEmitter.cpp b/utils/TableGen/ARMDecoderEmitter.cpp
index 914ea0ee940..e48ac1e6788 100644
--- a/utils/TableGen/ARMDecoderEmitter.cpp
+++ b/utils/TableGen/ARMDecoderEmitter.cpp
@@ -1632,6 +1632,11 @@ ARMDEBackend::populateInstruction(const CodeGenInstruction &CGI,
     if (Name == "tADR")
       return false;
 
+    // Delegate t2ADR disassembly to the more generic t2ADDri12/t2SUBri12
+    // instructions.
+    if (Name == "t2ADR")
+      return false;
+
     // Ignore tADDrSP, tADDspr, and tPICADD, prefer the generic tADDhirr.
     // Ignore t2SUBrSPs, prefer the t2SUB[S]r[r|s].
     // Ignore t2ADDrSPs, prefer the t2ADD[S]r[r|s].