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 | 52925b60f1cd4cf810524ca05b00a207a926ab9f (patch) | |
| tree | f08d9eaeda8876bbbbb0088e5ee71450619d0eb7 /lib | |
| parent | 47245422a45e1a2e89f402e745c6fbfa63d25c6e (diff) | |
| download | llvm-52925b60f1cd4cf810524ca05b00a207a926ab9f.tar.gz llvm-52925b60f1cd4cf810524ca05b00a207a926ab9f.tar.bz2 llvm-52925b60f1cd4cf810524ca05b00a207a926ab9f.tar.xz | |
Some instructions end with an "ls" prefix, but it doesn't indicate that they are
conditional. Check for those instructions explicitly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117747 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index ecca95ccad..327af20d99 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/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)); |