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

[Jim Grosbach]

Author: grosbach
Date: Tue Dec 13 15:06:41 2011
New Revision: 146516

URL: http://llvm.org/viewvc/llvm-project?rev=146516&view=rev
Log:
Thumb2 tweak for ccout handling in RSB parsing.

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=146516&r1=146515&r2=146516&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Tue Dec 13 15:06:41 2011
@@ -4737,8 +4737,11 @@
     const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Op->getImm());
     if (CE && CE->getValue() == 0 &&
         (isThumbOne() ||
+         // The cc_out operand matches the IT block.
+         ((inITBlock() != CarrySetting) &&
+         // Neither register operand is a high register.
          (isARMLowRegister(static_cast<ARMOperand*>(Operands[3])->getReg()) &&
-          isARMLowRegister(static_cast<ARMOperand*>(Operands[4])->getReg())))) {
+          isARMLowRegister(static_cast<ARMOperand*>(Operands[4])->getReg()))))){
       Operands.erase(Operands.begin() + 5);
       Operands.push_back(ARMOperand::CreateToken("#0", Op->getStartLoc()));
       delete Op;