From: Daniel Dunbar <daniel@zuster.org>
Date: Mon, 10 Jan 2011 21:01:03 +0000 (+0000)
Subject: McARM: Flush out hard coded known non-predicated mnemonic list.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ab1112bdc30b8675bb12431d8b5b270da42f1b5;p=oota-llvm.git

McARM: Flush out hard coded known non-predicated mnemonic list.

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

diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index d53ce935607..030e7fd98f0 100644
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -869,9 +869,18 @@ bool ARMAsmParser::ParseOperand(SmallVectorImpl<MCParsedAsmOperand*> &Operands){
 // FIXME: Would be nice to autogen this.
 static unsigned SplitMnemonicAndCC(StringRef &Mnemonic) {
   // Ignore some mnemonics we know aren't predicated forms.
-  if (Mnemonic == "movs" ||
-      Mnemonic == "vmls" ||
-      Mnemonic == "vnmls")
+  if (Mnemonic == "teq" || Mnemonic == "vceq" ||
+      Mnemonic == "movs" ||
+      Mnemonic == "svc" ||
+      (Mnemonic == "mls" || Mnemonic == "smmls" || Mnemonic == "vcls" ||
+       Mnemonic == "vmls" || Mnemonic == "vnmls") ||
+      Mnemonic == "vacge" || Mnemonic == "vcge" ||
+      Mnemonic == "vclt" ||
+      Mnemonic == "vacgt" || Mnemonic == "vcgt" ||
+      Mnemonic == "vcle" ||
+      (Mnemonic == "smlal" || Mnemonic == "umaal" || Mnemonic == "umlal" ||
+       Mnemonic == "vabal" || Mnemonic == "vmlal" || Mnemonic == "vpadal" ||
+       Mnemonic == "vqdmlal"))
     return ARMCC::AL;
 
   // Otherwise, determine the predicate.
diff --git a/test/MC/ARM/neon-absdiff-encoding.s b/test/MC/ARM/neon-absdiff-encoding.s
index d678cafa2c6..f43ea6582a2 100644
--- a/test/MC/ARM/neon-absdiff-encoding.s
+++ b/test/MC/ARM/neon-absdiff-encoding.s
@@ -1,6 +1,4 @@
 @ RUN: llvm-mc -mcpu=cortex-a8 -triple arm-unknown-unknown -show-encoding < %s | FileCheck %s
-@ XFAIL: *
-@ NOTE: This currently fails because the ASM parser doesn't parse vabal.
 
 @ CHECK: vabd.s8	d16, d16, d17           @ encoding: [0xa1,0x07,0x40,0xf2]
 	vabd.s8	d16, d16, d17
diff --git a/test/MC/ARM/neon-bitcount-encoding.s b/test/MC/ARM/neon-bitcount-encoding.s
index 68d7f1293cd..2c9518b32c1 100644
--- a/test/MC/ARM/neon-bitcount-encoding.s
+++ b/test/MC/ARM/neon-bitcount-encoding.s
@@ -1,5 +1,4 @@
 @ RUN: llvm-mc -mcpu=cortex-a8 -triple arm-unknown-unknown -show-encoding < %s | FileCheck %s
-@ XFAIL: *
 
 @ CHECK: vcnt.8	d16, d16                @ encoding: [0x20,0x05,0xf0,0xf3]
 	vcnt.8	d16, d16
diff --git a/test/MC/ARM/neon-pairwise-encoding.s b/test/MC/ARM/neon-pairwise-encoding.s
index 40c2a0bbd5a..65c47bd64ae 100644
--- a/test/MC/ARM/neon-pairwise-encoding.s
+++ b/test/MC/ARM/neon-pairwise-encoding.s
@@ -1,5 +1,4 @@
 @ RUN: llvm-mc -mcpu=cortex-a8 -triple arm-unknown-unknown -show-encoding < %s | FileCheck %s
-@ XFAIL: *
 
 @ CHECK: vpadd.i8	d16, d17, d16   @ encoding: [0xb0,0x0b,0x41,0xf2]
 	vpadd.i8	d16, d17, d16