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

[Jim Grosbach]

Author: grosbach
Date: Fri Aug 19 17:51:03 2011
New Revision: 138131

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

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=138131&r1=138130&r2=138131&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Fri Aug 19 17:51:03 2011
@@ -2831,7 +2831,7 @@
       Mnemonic == "umlal" || Mnemonic == "orr" || Mnemonic == "mvn" ||
       Mnemonic == "rsb" || Mnemonic == "rsc" || Mnemonic == "orn" ||
       Mnemonic == "sbc" || Mnemonic == "mla" || Mnemonic == "umull" ||
-      Mnemonic == "eor" || Mnemonic == "smlal" ||
+      Mnemonic == "eor" || Mnemonic == "smlal" || Mnemonic == "neg" ||
       // FIXME: We need a better way. This really confused Thumb2
       // parsing for 'mov'.
       (Mnemonic == "mov" && !isThumbOne())) {

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=138131&r1=138130&r2=138131&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/basic-thumb-instructions.s (original)
+++ llvm/trunk/test/MC/ARM/basic-thumb-instructions.s Fri Aug 19 17:51:03 2011
@@ -339,3 +339,11 @@
         mvns r6, r3
 
 @ CHECK: mvns	r6, r3                  @ encoding: [0xde,0x43]
+
+
+ at ------------------------------------------------------------------------------
+@ NEG
+ at ------------------------------------------------------------------------------
+        negs r3, r4
+
+@ CHECK: rsbs	r3, r4, #0              @ encoding: [0x63,0x42]