From: Owen Anderson <resistor@mac.com>
Date: Tue, 16 Aug 2011 23:45:44 +0000 (+0000)
Subject: Separate out Thumb1 instructions that need an S bit operand from those that do not... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16280308ac6f20d9da06eafcc19e4a6777f49750;p=oota-llvm.git

Separate out Thumb1 instructions that need an S bit operand from those that do not, for the purposes of decoding them.


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

diff --git a/lib/Target/ARM/ARMInstrFormats.td b/lib/Target/ARM/ARMInstrFormats.td
index fecc6bfdef8..ef5834b0acf 100644
--- a/lib/Target/ARM/ARMInstrFormats.td
+++ b/lib/Target/ARM/ARMInstrFormats.td
@@ -902,6 +902,7 @@ class Thumb1sI<dag oops, dag iops, AddrMode am, int sz,
   let Pattern = pattern;
   let thumbArithFlagSetting = 1;
   list<Predicate> Predicates = [IsThumb, IsThumb1Only];
+  let DecoderNamespace = "ThumbSBit";
 }
 
 class T1sI<dag oops, dag iops, InstrItinClass itin,
diff --git a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
index 28dd986d65e..cb7a45a2572 100644
--- a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
+++ b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
@@ -415,6 +415,14 @@ bool ThumbDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
 
   uint16_t insn16 = (bytes[1] << 8) | bytes[0];
   bool result = decodeThumbInstruction16(MI, insn16, Address, this);
+  if (result) {
+    Size = 2;
+    AddThumbPredicate(MI);
+    return true;
+  }
+
+  MI.clear();
+  result = decodeThumbSBitInstruction16(MI, insn16, Address, this);
   if (result) {
     Size = 2;
     bool InITBlock = !ITBlock.empty();