Some instructions end with an "ls" prefix, but it doesn't indicate that they are
conditional. Check for those instructions explicitly.
llvm-svn: 117747
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index ecca95c..327af20 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -741,10 +741,16 @@
.Case("al", ARMCC::AL)
.Default(~0U);
- if (CC != ~0U)
- Head = Head.slice(0, Head.size() - 2);
- else
+ if (CC != ~0U) {
+ if (CC == ARMCC::LS &&
+ (Head.compare("vmls") == 0 || Head.compare("vnmls") == 0)) {
+ CC = ARMCC::AL;
+ } else {
+ Head = Head.slice(0, Head.size() - 2);
+ }
+ } else {
CC = ARMCC::AL;
+ }
Operands.push_back(ARMOperand::CreateToken(Head, NameLoc));
Operands.push_back(ARMOperand::CreateCondCode(ARMCC::CondCodes(CC), NameLoc));