[llvm-commits] [llvm] r138311 - in /llvm/trunk: lib/Target/ARM/AsmParser/ARMAsmParser.cpp test/MC/ARM/basic-thumb-instructions.s

[Jim Grosbach]

Author: grosbach
Date: Mon Aug 22 18:55:58 2011
New Revision: 138311

URL: http://llvm.org/viewvc/llvm-project?rev=138311&view=rev
Log:
Thumb parsing and encoding for SBC.

Modified:
    llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
    llvm/trunk/test/MC/ARM/basic-thumb-instructions.s

Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=138311&r1=138310&r2=138311&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Mon Aug 22 18:55:58 2011
@@ -2755,7 +2755,8 @@
   // predicated but do have a carry-set and so weren't caught above.
   if (Mnemonic != "adcs" && Mnemonic != "bics" && Mnemonic != "movs" &&
       Mnemonic != "muls" && Mnemonic != "smlals" && Mnemonic != "smulls" &&
-      Mnemonic != "umlals" && Mnemonic != "umulls" && Mnemonic != "lsls") {
+      Mnemonic != "umlals" && Mnemonic != "umulls" && Mnemonic != "lsls" &&
+      Mnemonic != "sbcs") {
     unsigned CC = StringSwitch<unsigned>(Mnemonic.substr(Mnemonic.size()-2))
       .Case("eq", ARMCC::EQ)
       .Case("ne", ARMCC::NE)

Modified: llvm/trunk/test/MC/ARM/basic-thumb-instructions.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/basic-thumb-instructions.s?rev=138311&r1=138310&r2=138311&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/basic-thumb-instructions.s (original)
+++ llvm/trunk/test/MC/ARM/basic-thumb-instructions.s Mon Aug 22 18:55:58 2011
@@ -406,4 +406,12 @@
 @------------------------------------------------------------------------------
         rsbs r1, r3, #0
 
-	rsbs	r1, r3, #0              @ encoding: [0x59,0x42]
+@ CHECK: rsbs	r1, r3, #0              @ encoding: [0x59,0x42]
+
+
+ at ------------------------------------------------------------------------------
+@ SBC
+ at ------------------------------------------------------------------------------
+        sbcs r4, r3
+
+@ CHECK: sbcs	r4, r3                  @ encoding: [0x9c,0x41]