ARM assembly parsing and encoding for UMLAL.

Fix parsing of the 's' suffix for the mnemonic. Add tests.

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

diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 352e90200981375378a9df0cb8677df79ad9e26b..6af52812944d783b256ce8eb2713616ad1058056 100644 (file)
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -2359,7 +2359,8 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
   // First, split out any predication code. Ignore mnemonics we know aren't
   // 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 != "muls" && Mnemonic != "smlals" && Mnemonic != "smulls" &&
+      Mnemonic != "umlals") {
     unsigned CC = StringSwitch<unsigned>(Mnemonic.substr(Mnemonic.size()-2))
       .Case("eq", ARMCC::EQ)
       .Case("ne", ARMCC::NE)

diff --git a/test/MC/ARM/basic-arm-instructions.s b/test/MC/ARM/basic-arm-instructions.s
index c5d27debc220d1bc5902b23a34ba40d136e239b6..f09bfd92dc222ab6b37470acc455230de4579da4 100644 (file)
--- a/test/MC/ARM/basic-arm-instructions.s
+++ b/test/MC/ARM/basic-arm-instructions.s
@@ -2068,3 +2068,16 @@ _func:
 @ CHECK: umaal r3, r4, r5, r6          @ encoding: [0x95,0x46,0x43,0xe0]
 @ CHECK: umaallt       r3, r4, r5, r6  @ encoding: [0x95,0x46,0x43,0xb0]
 
+
+@------------------------------------------------------------------------------
+@ UMLAL
+@------------------------------------------------------------------------------
+        umlal r2, r4, r6, r8
+        umlalgt r6, r1, r2, r6
+        umlals r2, r9, r2, r3
+        umlalseq r3, r5, r1, r2
+
+@ CHECK: umlal r2, r4, r6, r8          @ encoding: [0x96,0x28,0xa4,0xe0]
+@ CHECK: umlalgt       r6, r1, r2, r6  @ encoding: [0x92,0x66,0xa1,0xc0]
+@ CHECK: umlals        r2, r9, r2, r3          @ encoding: [0x92,0x23,0xb9,0xe0]
+@ CHECK: umlalseq      r3, r5, r1, r2  @ encoding: [0x91,0x32,0xb5,0x00]