RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-04 18:06:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use deterministic iterator for treeRoots.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1967 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Vikram S. Adve 2002-03-24 03:36:52 +00:00
parent d7e6becd3e
commit 4e7bc49b54
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/CodeGen/InstrSelection/InstrSelection.cpp
View File

@ -98,12 +98,11 @@ SelectInstructionsForMethod(Method* method, TargetMachine &target)
//
// Invoke BURG instruction selection for each tree
//
const std::hash_set<InstructionNode*> &treeRoots = instrForest.getRootSet();
for (std::hash_set<InstructionNode*>::const_iterator
treeRootIter = treeRoots.begin(); treeRootIter != treeRoots.end();
++treeRootIter)
for (InstrForest::const_root_iterator RI = instrForest.roots_begin();
RI != instrForest.roots_end(); ++RI)
{
InstrTreeNode* basicNode = *treeRootIter;
InstructionNode* basicNode = *RI;
assert(basicNode->parent() == NULL && "A `root' node has a parent?");
// Invoke BURM to label each tree node with a state
burm_label(basicNode);
@ -131,7 +130,7 @@ SelectInstructionsForMethod(Method* method, TargetMachine &target)
MachineCodeForBasicBlock& bbMvec = (*BI)->getMachineInstrVec();
for (BasicBlock::iterator II = (*BI)->begin(); II != (*BI)->end(); ++II)
{
MachineCodeForInstruction &mvec = MachineCodeForInstruction::get(*II);
MachineCodeForInstruction &mvec =MachineCodeForInstruction::get(*II);
for (unsigned i=0; i < mvec.size(); i++)
bbMvec.push_back(mvec[i]);
}
@ -163,7 +162,7 @@ void
InsertPhiElimInstructions(BasicBlock *BB, const vector<MachineInstr*>& CpVec)
{
Instruction *TermInst = (Instruction*)BB->getTerminator();
MachineCodeForInstruction &MC4Term = MachineCodeForInstruction::get(TermInst);
MachineCodeForInstruction &MC4Term =MachineCodeForInstruction::get(TermInst);
MachineInstr *FirstMIOfTerm = *( MC4Term.begin() );
assert( FirstMIOfTerm && "No Machine Instrs for terminator" );
@ -209,8 +208,8 @@ InsertCode4AllPhisInMeth(Method *method, TargetMachine &target)
PHINode *PN = (PHINode *) (*IIt);
Value *PhiCpRes = new Value(PN->getType(), PN->getValueType(),"PhiCp:");
Value *PhiCpRes = new Value(PN->getType(),PN->getValueType(),"PhiCp:");
// for each incoming value of the phi, insert phi elimination
//
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) {
@ -219,7 +218,8 @@ InsertCode4AllPhisInMeth(Method *method, TargetMachine &target)
target.getRegInfo().cpValue2Value(PN->getIncomingValue(i),
PhiCpRes);
vector<MachineInstr*> CpVec = FixConstantOperandsForInstr(PN, CpMI, target);
vector<MachineInstr*> CpVec = FixConstantOperandsForInstr(PN, CpMI,
target);
CpVec.push_back(CpMI);
InsertPhiElimInstructions(PN->getIncomingBlock(i), CpVec);

20
lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
View File

@ -98,12 +98,11 @@ SelectInstructionsForMethod(Method* method, TargetMachine &target)
//
// Invoke BURG instruction selection for each tree
//
const std::hash_set<InstructionNode*> &treeRoots = instrForest.getRootSet();
for (std::hash_set<InstructionNode*>::const_iterator
treeRootIter = treeRoots.begin(); treeRootIter != treeRoots.end();
++treeRootIter)
for (InstrForest::const_root_iterator RI = instrForest.roots_begin();
RI != instrForest.roots_end(); ++RI)
{
InstrTreeNode* basicNode = *treeRootIter;
InstructionNode* basicNode = *RI;
assert(basicNode->parent() == NULL && "A `root' node has a parent?");
// Invoke BURM to label each tree node with a state
burm_label(basicNode);
@ -131,7 +130,7 @@ SelectInstructionsForMethod(Method* method, TargetMachine &target)
MachineCodeForBasicBlock& bbMvec = (*BI)->getMachineInstrVec();
for (BasicBlock::iterator II = (*BI)->begin(); II != (*BI)->end(); ++II)
{
MachineCodeForInstruction &mvec = MachineCodeForInstruction::get(*II);
MachineCodeForInstruction &mvec =MachineCodeForInstruction::get(*II);
for (unsigned i=0; i < mvec.size(); i++)
bbMvec.push_back(mvec[i]);
}
@ -163,7 +162,7 @@ void
InsertPhiElimInstructions(BasicBlock *BB, const vector<MachineInstr*>& CpVec)
{
Instruction *TermInst = (Instruction*)BB->getTerminator();
MachineCodeForInstruction &MC4Term = MachineCodeForInstruction::get(TermInst);
MachineCodeForInstruction &MC4Term =MachineCodeForInstruction::get(TermInst);
MachineInstr *FirstMIOfTerm = *( MC4Term.begin() );
assert( FirstMIOfTerm && "No Machine Instrs for terminator" );
@ -209,8 +208,8 @@ InsertCode4AllPhisInMeth(Method *method, TargetMachine &target)
PHINode *PN = (PHINode *) (*IIt);
Value *PhiCpRes = new Value(PN->getType(), PN->getValueType(),"PhiCp:");
Value *PhiCpRes = new Value(PN->getType(),PN->getValueType(),"PhiCp:");
// for each incoming value of the phi, insert phi elimination
//
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) {
@ -219,7 +218,8 @@ InsertCode4AllPhisInMeth(Method *method, TargetMachine &target)
target.getRegInfo().cpValue2Value(PN->getIncomingValue(i),
PhiCpRes);
vector<MachineInstr*> CpVec = FixConstantOperandsForInstr(PN, CpMI, target);
vector<MachineInstr*> CpVec = FixConstantOperandsForInstr(PN, CpMI,
target);
CpVec.push_back(CpMI);
InsertPhiElimInstructions(PN->getIncomingBlock(i), CpVec);