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

[Jim Grosbach]

Author: grosbach
Date: Fri Sep 16 11:38:00 2011
New Revision: 139902

URL: http://llvm.org/viewvc/llvm-project?rev=139902&view=rev
Log:
Thumb2 assembly parsing and encoding for SMLAL.

Modified:
    llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
    llvm/trunk/test/MC/ARM/basic-thumb2-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=139902&r1=139901&r2=139902&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Fri Sep 16 11:38:00 2011
@@ -3217,9 +3217,10 @@
       Mnemonic == "mul" || Mnemonic == "bic" || Mnemonic == "asr" ||
       Mnemonic == "umlal" || Mnemonic == "orr" || Mnemonic == "mvn" ||
       Mnemonic == "rsb" || Mnemonic == "rsc" || Mnemonic == "orn" ||
-      Mnemonic == "sbc" || Mnemonic == "umull" ||
-      Mnemonic == "eor" || Mnemonic == "smlal" || Mnemonic == "neg" ||
-      ((Mnemonic == "mov" || Mnemonic == "mla") && !isThumb())) {
+      Mnemonic == "sbc" || Mnemonic == "umull" || Mnemonic == "eor" ||
+      Mnemonic == "neg" ||
+      (!isThumb() && (Mnemonic == "mov" || Mnemonic == "mla" ||
+                      Mnemonic == "smlal"))) {
     CanAcceptCarrySet = true;
   } else {
     CanAcceptCarrySet = false;

Modified: llvm/trunk/test/MC/ARM/basic-thumb2-instructions.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/basic-thumb2-instructions.s?rev=139902&r1=139901&r2=139902&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/basic-thumb2-instructions.s (original)
+++ llvm/trunk/test/MC/ARM/basic-thumb2-instructions.s Fri Sep 16 11:38:00 2011
@@ -1787,6 +1787,18 @@
 
 
 @------------------------------------------------------------------------------
+@ SMLAL
+ at ------------------------------------------------------------------------------
+        smlal r2, r3, r5, r8
+        it eq
+        smlaleq r2, r3, r5, r8
+
+@ CHECK: smlal	r2, r3, r5, r8          @ encoding: [0xc5,0xfb,0x08,0x23]
+@ CHECK: it	eq                      @ encoding: [0x08,0xbf]
+@ CHECK: smlaleq r2, r3, r5, r8         @ encoding: [0xc5,0xfb,0x08,0x23]
+
+
+ at ------------------------------------------------------------------------------
 @ SUB (register)
 @------------------------------------------------------------------------------
         sub.w r5, r2, r12, rrx