diff options
| author | Bill Wendling <isanbard@gmail.com> | 2010-10-29 23:50:21 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2010-10-29 23:50:21 +0000 |
| commit | 193961bb1a64d8e60ba4ee7df6096a450f94fe11 (patch) | |
| tree | 01e25d188e9377c6a056140d52953ace1c04ee52 /llvm/lib | |
| parent | a319ba384d73e089b8ddcee69a80f2dafbfaac2c (diff) | |
| download | bcm5719-llvm-193961bb1a64d8e60ba4ee7df6096a450f94fe11.tar.gz bcm5719-llvm-193961bb1a64d8e60ba4ee7df6096a450f94fe11.zip | |
Some instructions end with an "ls" prefix, but it doesn't indicate that they are
conditional. Check for those instructions explicitly.
llvm-svn: 117747
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index ecca95ccadd..327af20d993 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -741,10 +741,16 @@ bool ARMAsmParser::ParseInstruction(StringRef Name, SMLoc NameLoc, .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)); |
