aboutsummaryrefslogtreecommitdiff
path: root/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2010-11-21 10:56:05 +0000
committerBill Wendling <isanbard@gmail.com>2010-11-21 10:56:05 +0000
commit9717fa9f29696bca45ddfdf206b1c382c8b40b78 (patch)
treec35b3af129539cd3ed046a882f6b6572adf8456c /lib/Target/ARM/AsmParser/ARMAsmParser.cpp
parent7d0affdf02f5bbdda5f6ee067c5003f87e9ccc39 (diff)
The "trap" instruction is one of this which doesn't have a condition code. Hack
the code to not add a "condition code" if it's trap. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119937 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
-rw-r--r--lib/Target/ARM/AsmParser/ARMAsmParser.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 4b21cc6d85..7c34b58ec2 100644
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -857,8 +857,11 @@ bool ARMAsmParser::ParseInstruction(StringRef Name, SMLoc NameLoc,
}
Operands.push_back(ARMOperand::CreateToken(Head, NameLoc));
- // FIXME: Should only add this operand for predicated instructions
- Operands.push_back(ARMOperand::CreateCondCode(ARMCC::CondCodes(CC), NameLoc));
+
+ if (Head != "trap")
+ // FIXME: Should only add this operand for predicated instructions
+ Operands.push_back(ARMOperand::CreateCondCode(ARMCC::CondCodes(CC),
+ NameLoc));
// Add the remaining tokens in the mnemonic.
while (Next != StringRef::npos) {