From f81af21caf9c0f62c60b72762d9a927e8c24f679 Mon Sep 17 00:00:00 2001 From: Alkis Evlogimenos Date: Sat, 14 Feb 2004 01:18:34 +0000 Subject: [PATCH] Use newly added next() and prior() utility functions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11430 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/PHIElimination.cpp | 7 +++---- lib/CodeGen/TwoAddressInstructionPass.cpp | 4 ++-- lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp | 8 +++----- lib/Target/SparcV9/SparcV9PeepholeOpts.cpp | 3 ++- lib/Target/X86/FloatingPoint.cpp | 8 +++----- lib/Target/X86/PeepholeOptimizer.cpp | 6 ++++-- lib/Target/X86/X86FloatingPoint.cpp | 8 +++----- lib/Target/X86/X86PeepholeOpt.cpp | 6 ++++-- lib/Target/X86/X86RegisterInfo.cpp | 3 ++- 9 files changed, 26 insertions(+), 27 deletions(-) diff --git a/lib/CodeGen/PHIElimination.cpp b/lib/CodeGen/PHIElimination.cpp index e0025f9e4fa..06305826e80 100644 --- a/lib/CodeGen/PHIElimination.cpp +++ b/lib/CodeGen/PHIElimination.cpp @@ -20,6 +20,7 @@ #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Support/CFG.h" +#include "Support/STLExtras.h" namespace llvm { @@ -171,8 +172,7 @@ bool PNE::EliminatePHINodes(MachineFunction &MF, MachineBasicBlock &MBB) { bool HaveNotEmitted = true; if (I != opBlock.begin()) { - MachineBasicBlock::iterator PrevInst = I; - --PrevInst; + MachineBasicBlock::iterator PrevInst = prior(I); for (unsigned i = 0, e = PrevInst->getNumOperands(); i != e; ++i) { MachineOperand &MO = PrevInst->getOperand(i); if (MO.isRegister() && MO.getReg() == IncomingReg) @@ -253,8 +253,7 @@ bool PNE::EliminatePHINodes(MachineFunction &MF, MachineBasicBlock &MBB) { // kills the incoming value! // if (!ValueIsLive) { - MachineBasicBlock::iterator Prev = I; - --Prev; + MachineBasicBlock::iterator Prev = prior(I); LV->addVirtualRegisterKilled(SrcReg, &opBlock, Prev); } } diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp index 8dc2ffe365d..6f1e9901406 100644 --- a/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -38,6 +38,7 @@ #include "llvm/Target/TargetMachine.h" #include "Support/Debug.h" #include "Support/Statistic.h" +#include "Support/STLExtras.h" #include using namespace llvm; @@ -134,8 +135,7 @@ bool TwoAddressInstructionPass::runOnMachineFunction(MachineFunction &MF) { unsigned Added = MRI.copyRegToReg(*mbbi, mi, regA, regB, rc); numInstrsAdded += Added; - MachineBasicBlock::iterator prevMi = mi; - --prevMi; + MachineBasicBlock::iterator prevMi = prior(mi); DEBUG(std::cerr << "\t\tadded instruction: "; prevMi->print(std::cerr, TM)); diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp index cc019b478a7..a33d5c9366e 100644 --- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp +++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp @@ -514,7 +514,7 @@ void PhyRegAlloc::updateMachineCode() for (MachineBasicBlock::iterator MII = MBB.begin(); MII != MBB.end(); ++MII) if (unsigned delaySlots = TM.getInstrInfo().getNumDelaySlots(MII->getOpcode())) { - MachineBasicBlock::iterator DelaySlotMI = MII; ++DelaySlotMI; + MachineBasicBlock::iterator DelaySlotMI = next(MII); assert(DelaySlotMI != MBB.end() && "no instruction for delay slot"); // Check the 2 conditions above: @@ -552,8 +552,7 @@ void PhyRegAlloc::updateMachineCode() else { // For non-branch instr with delay slots (probably a call), move // InstrAfter to the instr. in the last delay slot. - MachineBasicBlock::iterator tmp = MII; - std::advance(tmp, delaySlots); + MachineBasicBlock::iterator tmp = next(MII, delaySlots); move2DelayedInstr(MII, tmp); } } @@ -646,8 +645,7 @@ void PhyRegAlloc::insertCode4SpilledLR(const LiveRange *LR, // include all live variables before that branch or return -- we don't want to // trample those! Verify that the set is included in the LV set before MInst. if (MII != MBB.begin()) { - MachineBasicBlock::iterator PredMI = MII; - --PredMI; + MachineBasicBlock::iterator PredMI = prior(MII); if (unsigned DS = TM.getInstrInfo().getNumDelaySlots(PredMI->getOpcode())) assert(set_difference(LVI->getLiveVarSetBeforeMInst(PredMI), LVSetBef) .empty() && "Live-var set before branch should be included in " diff --git a/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp b/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp index d8a5515c72d..dc56100a1eb 100644 --- a/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp +++ b/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp @@ -19,6 +19,7 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" +#include "Support/STLExtras.h" namespace llvm { @@ -31,7 +32,7 @@ DeleteInstruction(MachineBasicBlock& mvec, // Check if this instruction is in a delay slot of its predecessor. if (BBI != mvec.begin()) { const TargetInstrInfo& mii = target.getInstrInfo(); - MachineBasicBlock::iterator predMI = BBI; --predMI; + MachineBasicBlock::iterator predMI = prior(BBI); if (unsigned ndelay = mii.getNumDelaySlots(predMI->getOpcode())) { // This instruction is in a delay slot of its predecessor, so // replace it with a nop. By replacing in place, we save having diff --git a/lib/Target/X86/FloatingPoint.cpp b/lib/Target/X86/FloatingPoint.cpp index 53f6ec0feb4..28517c339ca 100644 --- a/lib/Target/X86/FloatingPoint.cpp +++ b/lib/Target/X86/FloatingPoint.cpp @@ -42,6 +42,7 @@ #include "Support/Debug.h" #include "Support/DepthFirstIterator.h" #include "Support/Statistic.h" +#include "Support/STLExtras.h" #include #include using namespace llvm; @@ -199,11 +200,8 @@ bool FPS::processBasicBlock(MachineFunction &MF, MachineBasicBlock &BB) { continue; // Efficiently ignore non-fp insts! MachineInstr *PrevMI = 0; - if (I != BB.begin()) { - MachineBasicBlock::iterator tmp = I; - --tmp; - PrevMI = tmp; - } + if (I != BB.begin()) + PrevMI = prior(I); ++NumFP; // Keep track of # of pseudo instrs DEBUG(std::cerr << "\nFPInst:\t"; diff --git a/lib/Target/X86/PeepholeOptimizer.cpp b/lib/Target/X86/PeepholeOptimizer.cpp index f09e8d7ff1c..0c159e16985 100644 --- a/lib/Target/X86/PeepholeOptimizer.cpp +++ b/lib/Target/X86/PeepholeOptimizer.cpp @@ -16,6 +16,8 @@ #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/Target/MRegisterInfo.h" #include "Support/Statistic.h" +#include "Support/STLExtras.h" + using namespace llvm; namespace { @@ -51,7 +53,7 @@ bool PH::runOnMachineFunction(MachineFunction &MF) { bool PH::PeepholeOptimize(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I) { assert(I != MBB.end()); - MachineBasicBlock::iterator NextI = I; ++NextI; + MachineBasicBlock::iterator NextI = next(I); MachineInstr *MI = I; MachineInstr *Next = (NextI != MBB.end()) ? &*NextI : (MachineInstr*)0; @@ -376,7 +378,7 @@ bool SSAPH::OptimizeAddress(MachineInstr *MI, unsigned OpNo) { bool SSAPH::PeepholeOptimize(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I) { - MachineBasicBlock::iterator NextI = I; ++NextI; + MachineBasicBlock::iterator NextI = next(I); MachineInstr *MI = I; MachineInstr *Next = (NextI != MBB.end()) ? &*NextI : (MachineInstr*)0; diff --git a/lib/Target/X86/X86FloatingPoint.cpp b/lib/Target/X86/X86FloatingPoint.cpp index 53f6ec0feb4..28517c339ca 100644 --- a/lib/Target/X86/X86FloatingPoint.cpp +++ b/lib/Target/X86/X86FloatingPoint.cpp @@ -42,6 +42,7 @@ #include "Support/Debug.h" #include "Support/DepthFirstIterator.h" #include "Support/Statistic.h" +#include "Support/STLExtras.h" #include #include using namespace llvm; @@ -199,11 +200,8 @@ bool FPS::processBasicBlock(MachineFunction &MF, MachineBasicBlock &BB) { continue; // Efficiently ignore non-fp insts! MachineInstr *PrevMI = 0; - if (I != BB.begin()) { - MachineBasicBlock::iterator tmp = I; - --tmp; - PrevMI = tmp; - } + if (I != BB.begin()) + PrevMI = prior(I); ++NumFP; // Keep track of # of pseudo instrs DEBUG(std::cerr << "\nFPInst:\t"; diff --git a/lib/Target/X86/X86PeepholeOpt.cpp b/lib/Target/X86/X86PeepholeOpt.cpp index f09e8d7ff1c..0c159e16985 100644 --- a/lib/Target/X86/X86PeepholeOpt.cpp +++ b/lib/Target/X86/X86PeepholeOpt.cpp @@ -16,6 +16,8 @@ #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/Target/MRegisterInfo.h" #include "Support/Statistic.h" +#include "Support/STLExtras.h" + using namespace llvm; namespace { @@ -51,7 +53,7 @@ bool PH::runOnMachineFunction(MachineFunction &MF) { bool PH::PeepholeOptimize(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I) { assert(I != MBB.end()); - MachineBasicBlock::iterator NextI = I; ++NextI; + MachineBasicBlock::iterator NextI = next(I); MachineInstr *MI = I; MachineInstr *Next = (NextI != MBB.end()) ? &*NextI : (MachineInstr*)0; @@ -376,7 +378,7 @@ bool SSAPH::OptimizeAddress(MachineInstr *MI, unsigned OpNo) { bool SSAPH::PeepholeOptimize(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I) { - MachineBasicBlock::iterator NextI = I; ++NextI; + MachineBasicBlock::iterator NextI = next(I); MachineInstr *MI = I; MachineInstr *Next = (NextI != MBB.end()) ? &*NextI : (MachineInstr*)0; diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index 3031762288d..b2bf61ad3ed 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -24,6 +24,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetFrameInfo.h" #include "Support/CommandLine.h" +#include "Support/STLExtras.h" namespace llvm { @@ -223,7 +224,7 @@ int X86RegisterInfo::emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const { unsigned oldSize = MBB.size(); const MachineFrameInfo *MFI = MF.getFrameInfo(); - MachineBasicBlock::iterator MBBI = MBB.end(); --MBBI; + MachineBasicBlock::iterator MBBI = prior(MBB.end()); MachineInstr *MI; assert(MBBI->getOpcode() == X86::RET && "Can only insert epilog into returning blocks"); -- 2.34.1