commit e6d69e7dbee88a0a88f252a3e1e3f5f81472cf4b
author Johnny Chen <johnny.chen@apple.com> Thu Mar 24 20:42:48 2011 +0000
committer Johnny Chen <johnny.chen@apple.com> Thu Mar 24 20:42:48 2011 +0000
tree 303555abce960ceb8f0aed03bc6d71c4a40d0a6e
parent 23670e5b95fcaf88238239729457393b8cc831ff

ADR was added with the wrong encoding for inst{24-21}, and the ARM decoder was fooled.
Set the encoding bits to {0,?,?,0}, not 0.  Plus delegate the disassembly of ADR to
the more generic ADDri/SUBri instructions, and add a test case for that.


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

utils/TableGen/ARMDecoderEmitter.cpp

diff --git a/utils/TableGen/ARMDecoderEmitter.cpp b/utils/TableGen/ARMDecoderEmitter.cpp
index 09243e1..b174fa9 100644
--- a/utils/TableGen/ARMDecoderEmitter.cpp
+++ b/utils/TableGen/ARMDecoderEmitter.cpp
@@ -1584,6 +1584,10 @@
         Name == "MOVr_TC")
       return false;
 
+    // Delegate ADR disassembly to the more generic ADDri/SUBri instructions.
+    if (Name == "ADR")
+      return false;
+
     //
     // The following special cases are for conflict resolutions.
     //