From a0746bd50aa960e100eb6a94ecded3ac15242da6 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Wed, 9 Jun 2010 19:26:01 +0000 Subject: Allow target to place 2-address pass inserted copies in better spots. Thumb2 will use this to try to avoid breaking up IT blocks. llvm-svn: 105745 --- llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp') diff --git a/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp b/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp index fb33f887340..691444cdc02 100644 --- a/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp +++ b/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp @@ -61,15 +61,7 @@ static ARMCC::CondCodes getPredicate(const MachineInstr *MI, unsigned &PredReg){ unsigned Opc = MI->getOpcode(); if (Opc == ARM::tBcc || Opc == ARM::t2Bcc) return ARMCC::AL; - - int PIdx = MI->findFirstPredOperandIdx(); - if (PIdx == -1) { - PredReg = 0; - return ARMCC::AL; - } - - PredReg = MI->getOperand(PIdx+1).getReg(); - return (ARMCC::CondCodes)MI->getOperand(PIdx).getImm(); + return llvm::getInstrPredicate(MI, PredReg); } bool @@ -242,15 +234,15 @@ bool Thumb2ITBlockPass::InsertITBlock(MachineInstr *First, MachineInstr *Last) { // Insert a new block for consecutive predicated instructions. MachineFunction *MF = MBB->getParent(); MachineBasicBlock *NewMBB = MF->CreateMachineBasicBlock(MBB->getBasicBlock()); - MachineFunction::iterator Pos = MBB; - MF->insert(++Pos, NewMBB); + MachineFunction::iterator InsertPos = MBB; + MF->insert(++InsertPos, NewMBB); // Move all the successors of this block to the specified block. NewMBB->transferSuccessors(MBB); // Add an edge from CurMBB to NewMBB for the fall-through. MBB->addSuccessor(NewMBB); - NewMBB->splice(NewMBB->end(), MBB, ++MBBI, MBB->end()); + NewMBB->splice(NewMBB->end(), MBB, ++MBBI, MBB->end()); return true; } -- cgit v1.2.3