From 056c669e933337b0876cbc17a3cebfb2e8e890af Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Mon, 27 Jul 2009 18:20:05 +0000 Subject: [PATCH] Get rid of some more getOpcode calls. This also fixes potential problems in ARMBaseInstrInfo routines not recognizing thumb1 instructions when 32-bit and 16-bit instructions mix. llvm-svn: 77218 --- llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp | 50 ++++++++++++++++++----------- llvm/lib/Target/ARM/ARMBaseInstrInfo.h | 18 ++++++++--- llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp | 2 +- llvm/lib/Target/ARM/ARMInstrInfo.cpp | 3 -- llvm/lib/Target/ARM/Thumb1InstrInfo.cpp | 3 -- llvm/lib/Target/ARM/Thumb2InstrInfo.cpp | 3 -- 6 files changed, 46 insertions(+), 33 deletions(-) diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp index 9f3edc7..e058c8a 100644 --- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp @@ -30,8 +30,9 @@ static cl::opt EnableARM3Addr("enable-arm-3-addr-conv", cl::Hidden, cl::desc("Enable ARM 2-addr to 3-addr conv")); -ARMBaseInstrInfo::ARMBaseInstrInfo(const ARMSubtarget &STI) - : TargetInstrInfoImpl(ARMInsts, array_lengthof(ARMInsts)) { +ARMBaseInstrInfo::ARMBaseInstrInfo(const ARMSubtarget &sti) + : TargetInstrInfoImpl(ARMInsts, array_lengthof(ARMInsts)), + STI(sti) { } MachineInstr * @@ -206,11 +207,11 @@ ARMBaseInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, // If there is only one terminator instruction, process it. unsigned LastOpc = LastInst->getOpcode(); if (I == MBB.begin() || !isUnpredicatedTerminator(--I)) { - if (LastOpc == getOpcode(ARMII::B)) { + if (isUncondBranchOpcode(LastOpc)) { TBB = LastInst->getOperand(0).getMBB(); return false; } - if (LastOpc == getOpcode(ARMII::Bcc)) { + if (isCondBranchOpcode(LastOpc)) { // Block ends with fall-through condbranch. TBB = LastInst->getOperand(0).getMBB(); Cond.push_back(LastInst->getOperand(1)); @@ -227,10 +228,9 @@ ARMBaseInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, if (SecondLastInst && I != MBB.begin() && isUnpredicatedTerminator(--I)) return true; - // If the block ends with ARMII::B and a ARMII::Bcc, handle it. + // If the block ends with a B and a Bcc, handle it. unsigned SecondLastOpc = SecondLastInst->getOpcode(); - if ((SecondLastOpc == getOpcode(ARMII::Bcc)) && - (LastOpc == getOpcode(ARMII::B))) { + if (isCondBranchOpcode(SecondLastOpc) && isUncondBranchOpcode(LastOpc)) { TBB = SecondLastInst->getOperand(0).getMBB(); Cond.push_back(SecondLastInst->getOperand(1)); Cond.push_back(SecondLastInst->getOperand(2)); @@ -240,8 +240,7 @@ ARMBaseInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, // If the block ends with two unconditional branches, handle it. The second // one is not executed, so remove it. - if ((SecondLastOpc == getOpcode(ARMII::B)) && - (LastOpc == getOpcode(ARMII::B))) { + if (isUncondBranchOpcode(SecondLastOpc) && isUncondBranchOpcode(LastOpc)) { TBB = SecondLastInst->getOperand(0).getMBB(); I = LastInst; if (AllowModify) @@ -257,7 +256,7 @@ ARMBaseInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, SecondLastOpc == ARM::BR_JTadd || SecondLastOpc == ARM::tBR_JTr || SecondLastOpc == ARM::t2BR_JT) && - (LastOpc == getOpcode(ARMII::B))) { + isUncondBranchOpcode(LastOpc)) { I = LastInst; if (AllowModify) I->eraseFromParent(); @@ -270,13 +269,11 @@ ARMBaseInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, unsigned ARMBaseInstrInfo::RemoveBranch(MachineBasicBlock &MBB) const { - int BOpc = getOpcode(ARMII::B); - int BccOpc = getOpcode(ARMII::Bcc); - MachineBasicBlock::iterator I = MBB.end(); if (I == MBB.begin()) return 0; --I; - if (I->getOpcode() != BOpc && I->getOpcode() != BccOpc) + if (!isUncondBranchOpcode(I->getOpcode()) && + !isCondBranchOpcode(I->getOpcode())) return 0; // Remove the branch. @@ -286,7 +283,7 @@ unsigned ARMBaseInstrInfo::RemoveBranch(MachineBasicBlock &MBB) const { if (I == MBB.begin()) return 1; --I; - if (I->getOpcode() != BccOpc) + if (!isCondBranchOpcode(I->getOpcode())) return 1; // Remove the branch. @@ -300,8 +297,10 @@ ARMBaseInstrInfo::InsertBranch(MachineBasicBlock &MBB, MachineBasicBlock *TBB, const SmallVectorImpl &Cond) const { // FIXME this should probably have a DebugLoc argument DebugLoc dl = DebugLoc::getUnknownLoc(); - int BOpc = getOpcode(ARMII::B); - int BccOpc = getOpcode(ARMII::Bcc); + int BOpc = !STI.isThumb() + ? ARM::B : (STI.isThumb2() ? ARM::t2B : ARM::tB); + int BccOpc = !STI.isThumb() + ? ARM::Bcc : (STI.isThumb2() ? ARM::t2Bcc : ARM::tBcc); // Shouldn't be a fall through. assert(TBB && "InsertBranch must not be told to insert a fallthrough"); @@ -335,8 +334,8 @@ bool ARMBaseInstrInfo:: PredicateInstruction(MachineInstr *MI, const SmallVectorImpl &Pred) const { unsigned Opc = MI->getOpcode(); - if (Opc == getOpcode(ARMII::B)) { - MI->setDesc(get(getOpcode(ARMII::Bcc))); + if (isUncondBranchOpcode(Opc)) { + MI->setDesc(get(getMatchingCondBranchOpcode(Opc))); MI->addOperand(MachineOperand::CreateImm(Pred[0].getImm())); MI->addOperand(MachineOperand::CreateReg(Pred[1].getReg(), false)); return true; @@ -792,3 +791,16 @@ ARMBaseInstrInfo::canFoldMemoryOperand(const MachineInstr *MI, return false; } + +int ARMBaseInstrInfo::getMatchingCondBranchOpcode(int Opc) const { + if (Opc == ARM::B) + return ARM::Bcc; + else if (Opc == ARM::tB) + return ARM::tBcc; + else if (Opc == ARM::t2B) + return ARM::t2Bcc; + + llvm_unreachable("Unknown unconditional branch opcode!"); + return 0; +} + diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.h b/llvm/lib/Target/ARM/ARMBaseInstrInfo.h index a2bcacc..375410d 100644 --- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.h +++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.h @@ -165,9 +165,6 @@ namespace ARMII { ADDri, ADDrs, ADDrr, - B, - Bcc, - BX_RET, LDRri, MOVr, STRri, @@ -193,9 +190,11 @@ const MachineInstrBuilder &AddDefaultT1CC(const MachineInstrBuilder &MIB) { } class ARMBaseInstrInfo : public TargetInstrInfoImpl { + const ARMSubtarget &STI; + protected: // Can be only subclassed. - explicit ARMBaseInstrInfo(const ARMSubtarget &STI); + explicit ARMBaseInstrInfo(const ARMSubtarget &sti); public: // Return the non-pre/post incrementing version of 'Opc'. Return 0 // if there is not such an opcode. @@ -292,6 +291,17 @@ public: MachineInstr* MI, const SmallVectorImpl &Ops, MachineInstr* LoadMI) const; + +private: + bool isUncondBranchOpcode(int Opc) const { + return Opc == ARM::B || Opc == ARM::tB || Opc == ARM::t2B; + } + + bool isCondBranchOpcode(int Opc) const { + return Opc == ARM::Bcc || Opc == ARM::tBcc || Opc == ARM::t2Bcc; + } + + int getMatchingCondBranchOpcode(int Opc) const; }; } diff --git a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp index f8c079f..791fd4c 100644 --- a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp +++ b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp @@ -1370,7 +1370,7 @@ void ARMBaseRegisterInfo:: emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const { MachineBasicBlock::iterator MBBI = prior(MBB.end()); - assert(MBBI->getOpcode() == (int)getOpcode(ARMII::BX_RET) && + assert(MBBI->getDesc().isReturn() && "Can only insert epilog into returning blocks"); DebugLoc dl = MBBI->getDebugLoc(); MachineFrameInfo *MFI = MF.getFrameInfo(); diff --git a/llvm/lib/Target/ARM/ARMInstrInfo.cpp b/llvm/lib/Target/ARM/ARMInstrInfo.cpp index 6b638d6..fda9fc2 100644 --- a/llvm/lib/Target/ARM/ARMInstrInfo.cpp +++ b/llvm/lib/Target/ARM/ARMInstrInfo.cpp @@ -68,9 +68,6 @@ getOpcode(ARMII::Op Op) const { case ARMII::ADDri: return ARM::ADDri; case ARMII::ADDrs: return ARM::ADDrs; case ARMII::ADDrr: return ARM::ADDrr; - case ARMII::B: return ARM::B; - case ARMII::Bcc: return ARM::Bcc; - case ARMII::BX_RET: return ARM::BX_RET; case ARMII::LDRri: return 0; case ARMII::MOVr: return ARM::MOVr; case ARMII::STRri: return 0; diff --git a/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp b/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp index ff98447..a4e8e9c 100644 --- a/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp +++ b/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp @@ -35,9 +35,6 @@ unsigned Thumb1InstrInfo::getOpcode(ARMII::Op Op) const { case ARMII::ADDri: return ARM::tADDi8; case ARMII::ADDrs: return 0; case ARMII::ADDrr: return ARM::tADDrr; - case ARMII::B: return ARM::tB; - case ARMII::Bcc: return ARM::tBcc; - case ARMII::BX_RET: return ARM::tBX_RET; case ARMII::LDRri: return 0; case ARMII::MOVr: return ARM::tMOVr; case ARMII::STRri: return 0; diff --git a/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp b/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp index 53b6007..45eb29c 100644 --- a/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp +++ b/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp @@ -36,9 +36,6 @@ unsigned Thumb2InstrInfo::getOpcode(ARMII::Op Op) const { case ARMII::ADDri: return ARM::t2ADDri; case ARMII::ADDrs: return ARM::t2ADDrs; case ARMII::ADDrr: return ARM::t2ADDrr; - case ARMII::B: return ARM::t2B; - case ARMII::Bcc: return ARM::t2Bcc; - case ARMII::BX_RET: return ARM::tBX_RET; case ARMII::LDRri: return ARM::t2LDRi12; case ARMII::MOVr: return ARM::t2MOVr; case ARMII::STRri: return ARM::t2STRi12; -- 2.7.4