[llvm-commits] [llvm] r119937 - /llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp

[Bill Wendling]

Author: void
Date: Sun Nov 21 04:56:05 2010
New Revision: 119937

URL: http://llvm.org/viewvc/llvm-project?rev=119937&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp

Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=119937&r1=119936&r2=119937&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Sun Nov 21 04:56:05 2010
@@ -857,8 +857,11 @@
   }
 
   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) {