mirror of
https://github.com/RPCSX/llvm.git
synced 2024-12-15 16:09:02 +00:00
Rename findRegisterUseOperand to findRegisterUseOperandIdx to avoid confusion.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36483 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
6bc6333a10
commit
faa510726f
@ -390,10 +390,10 @@ public:
|
||||
delete removeFromParent();
|
||||
}
|
||||
|
||||
/// findRegisterUseOperand() - Returns the operand index that is a use of
|
||||
/// findRegisterUseOperandIdx() - Returns the operand index that is a use of
|
||||
/// the specific register or -1 if it is not found. It further tightening
|
||||
/// the search criteria to a use that kills the register if isKill is true.
|
||||
int findRegisterUseOperand(unsigned Reg, bool isKill = false);
|
||||
int findRegisterUseOperandIdx(unsigned Reg, bool isKill = false);
|
||||
|
||||
/// findRegisterDefOperand() - Returns the MachineOperand that is a def of
|
||||
/// the specific register or NULL if it is not found.
|
||||
|
@ -887,7 +887,7 @@ bool LiveIntervals::AdjustCopiesBackFrom(LiveInterval &IntA, LiveInterval &IntB,
|
||||
|
||||
// If the source instruction was killing the source register before the
|
||||
// merge, unset the isKill marker given the live range has been extended.
|
||||
int UIdx = ValLREndInst->findRegisterUseOperand(IntB.reg, true);
|
||||
int UIdx = ValLREndInst->findRegisterUseOperandIdx(IntB.reg, true);
|
||||
if (UIdx != -1)
|
||||
ValLREndInst->getOperand(UIdx).unsetIsKill();
|
||||
|
||||
|
@ -435,7 +435,8 @@ bool LiveVariables::runOnMachineFunction(MachineFunction &mf) {
|
||||
"Cannot have a live-in virtual register!");
|
||||
HandlePhysRegUse(*I, Ret);
|
||||
// Add live-out registers as implicit uses.
|
||||
Ret->addRegOperand(*I, false, true);
|
||||
if (Ret->findRegisterUseOperandIdx(*I) == -1)
|
||||
Ret->addRegOperand(*I, false, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -169,10 +169,10 @@ bool MachineOperand::isIdenticalTo(const MachineOperand &Other) const {
|
||||
}
|
||||
}
|
||||
|
||||
/// findRegisterUseOperand() - Returns the MachineOperand that is a use of
|
||||
/// findRegisterUseOperandIdx() - Returns the MachineOperand that is a use of
|
||||
/// the specific register or -1 if it is not found. It further tightening
|
||||
/// the search criteria to a use that kills the register if isKill is true.
|
||||
int MachineInstr::findRegisterUseOperand(unsigned Reg, bool isKill){
|
||||
int MachineInstr::findRegisterUseOperandIdx(unsigned Reg, bool isKill) {
|
||||
for (unsigned i = 0, e = getNumOperands(); i != e; ++i) {
|
||||
MachineOperand &MO = getOperand(i);
|
||||
if (MO.isReg() && MO.isUse() && MO.getReg() == Reg)
|
||||
|
@ -235,7 +235,7 @@ static unsigned calcDistanceToUse(MachineBasicBlock *MBB,
|
||||
I = next(I);
|
||||
while (I != MBB->end()) {
|
||||
Dist++;
|
||||
if (I->findRegisterUseOperand(Reg) != -1)
|
||||
if (I->findRegisterUseOperandIdx(Reg) != -1)
|
||||
return Dist;
|
||||
I = next(I);
|
||||
}
|
||||
|
@ -764,7 +764,7 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
|
||||
// necessary.
|
||||
bool WasKill = false;
|
||||
if (SSMI) {
|
||||
int UIdx = SSMI->findRegisterUseOperand(PhysReg, true);
|
||||
int UIdx = SSMI->findRegisterUseOperandIdx(PhysReg, true);
|
||||
if (UIdx != -1) {
|
||||
MachineOperand &MOK = SSMI->getOperand(UIdx);
|
||||
WasKill = MOK.isKill();
|
||||
@ -849,7 +849,7 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
|
||||
// necessary.
|
||||
bool WasKill = false;
|
||||
if (SSMI) {
|
||||
int UIdx = SSMI->findRegisterUseOperand(PhysReg, true);
|
||||
int UIdx = SSMI->findRegisterUseOperandIdx(PhysReg, true);
|
||||
if (UIdx != -1) {
|
||||
MachineOperand &MOK = SSMI->getOperand(UIdx);
|
||||
WasKill = MOK.isKill();
|
||||
@ -859,7 +859,7 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
|
||||
MachineInstr *CopyMI = prior(MII);
|
||||
if (WasKill) {
|
||||
// Transfer kill to the next use.
|
||||
int UIdx = CopyMI->findRegisterUseOperand(PhysReg);
|
||||
int UIdx = CopyMI->findRegisterUseOperandIdx(PhysReg);
|
||||
assert(UIdx != -1);
|
||||
MachineOperand &MOU = CopyMI->getOperand(UIdx);
|
||||
MOU.setIsKill();
|
||||
@ -957,7 +957,7 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
|
||||
// extended. Remove its kill.
|
||||
bool WasKill = false;
|
||||
if (SSMI) {
|
||||
int UIdx = SSMI->findRegisterUseOperand(InReg, true);
|
||||
int UIdx = SSMI->findRegisterUseOperandIdx(InReg, true);
|
||||
if (UIdx != -1) {
|
||||
MachineOperand &MOK = SSMI->getOperand(UIdx);
|
||||
WasKill = MOK.isKill();
|
||||
@ -967,7 +967,7 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
|
||||
if (NextMII != MBB.end()) {
|
||||
// If NextMII uses InReg and the use is not a two address
|
||||
// operand, mark it killed.
|
||||
int UIdx = NextMII->findRegisterUseOperand(InReg);
|
||||
int UIdx = NextMII->findRegisterUseOperandIdx(InReg);
|
||||
if (UIdx != -1) {
|
||||
MachineOperand &MOU = NextMII->getOperand(UIdx);
|
||||
if (WasKill) {
|
||||
|
@ -278,7 +278,7 @@ ARMInstrInfo::convertToThreeAddress(MachineFunction::iterator &MFI,
|
||||
for (unsigned j = 0; j < 2; ++j) {
|
||||
// Look at the two new MI's in reverse order.
|
||||
MachineInstr *NewMI = NewMIs[j];
|
||||
int NIdx = NewMI->findRegisterUseOperand(Reg);
|
||||
int NIdx = NewMI->findRegisterUseOperandIdx(Reg);
|
||||
if (NIdx == -1)
|
||||
continue;
|
||||
LV.addVirtualRegisterKilled(Reg, NewMI);
|
||||
|
@ -221,7 +221,7 @@ ARMLoadStoreOpt::MergeLDR_STR(MachineBasicBlock &MBB, unsigned SIndex,
|
||||
}
|
||||
}
|
||||
|
||||
bool BaseKill = Loc->findRegisterUseOperand(Base, true) != -1;
|
||||
bool BaseKill = Loc->findRegisterUseOperandIdx(Base, true) != -1;
|
||||
if (mergeOps(MBB, ++Loc, SOffset, Base, BaseKill, Opcode,Scratch,Regs, TII)) {
|
||||
Merges.push_back(prior(Loc));
|
||||
for (unsigned i = SIndex, e = MemOps.size(); i != e; ++i) {
|
||||
|
Loading…
Reference in New Issue
Block a user