[llvm-commits] CVS: llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp
Chris Lattner
lattner at cs.uiuc.edu
Mon Oct 28 13:02:01 PST 2002
Changes in directory llvm/lib/CodeGen/InstrSelection:
InstrSelection.cpp updated: 1.52 -> 1.53
---
Log message:
Remove usage of MachineBasicBlock::get
---
Diffs of the changes:
Index: llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp
diff -u llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp:1.52 llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp:1.53
--- llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp:1.52 Sun Oct 27 23:30:46 2002
+++ llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp Mon Oct 28 13:01:16 2002
@@ -176,9 +176,9 @@
{
// for all basic blocks in function
//
- for (Function::iterator BB = F.begin(); BB != F.end(); ++BB) {
- BasicBlock::InstListType &InstList = BB->getInstList();
- for (BasicBlock::iterator IIt = InstList.begin();
+ MachineFunction &MF = MachineFunction::get(&F);
+ for (MachineFunction::iterator BB = MF.begin(); BB != MF.end(); ++BB) {
+ for (BasicBlock::iterator IIt = BB->getBasicBlock()->begin();
PHINode *PN = dyn_cast<PHINode>(&*IIt); ++IIt) {
// FIXME: This is probably wrong...
Value *PhiCpRes = new PHINode(PN->getType(), "PhiCp:");
@@ -208,11 +208,7 @@
vector<MachineInstr*> mvec;
Target.getRegInfo().cpValue2Value(PhiCpRes, PN, mvec);
-
- // get an iterator to machine instructions in the BB
- MachineBasicBlock& bbMvec = MachineBasicBlock::get(BB);
-
- bbMvec.insert(bbMvec.begin(), mvec.begin(), mvec.end());
+ BB->insert(BB->begin(), mvec.begin(), mvec.end());
} // for each Phi Instr in BB
} // for all BBs in function
}
@@ -229,21 +225,29 @@
Instruction *TermInst = (Instruction*)BB->getTerminator();
MachineCodeForInstruction &MC4Term = MachineCodeForInstruction::get(TermInst);
MachineInstr *FirstMIOfTerm = MC4Term.front();
-
assert (FirstMIOfTerm && "No Machine Instrs for terminator");
-
- MachineBasicBlock &bbMvec = MachineBasicBlock::get(BB);
+
+ MachineFunction &MF = MachineFunction::get(BB->getParent());
+ MachineBasicBlock *MBB;
+
+ // FIXME: if PHI instructions existed in the machine code, this would be
+ // unnecesary.
+ for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I)
+ if (I->getBasicBlock() == BB) {
+ MBB = I;
+ break;
+ }
// find the position of first machine instruction generated by the
// terminator of this BB
MachineBasicBlock::iterator MCIt =
- std::find(bbMvec.begin(), bbMvec.end(), FirstMIOfTerm);
+ std::find(MBB->begin(), MBB->end(), FirstMIOfTerm);
- assert( MCIt != bbMvec.end() && "Start inst of terminator not found");
+ assert(MCIt != MBB->end() && "Start inst of terminator not found");
// insert the copy instructions just before the first machine instruction
// generated for the terminator
- bbMvec.insert(MCIt, CpVec.begin(), CpVec.end());
+ MBB->insert(MCIt, CpVec.begin(), CpVec.end());
}
More information about the llvm-commits
mailing list