From 1dcfd3c1a6af9e118d42c54a7d8e680fb6aae4ff Mon Sep 17 00:00:00 2001 From: "Vikram S. Adve" Date: Mon, 8 Jul 2002 23:03:10 +0000 Subject: [PATCH] Moved class MachineCodeForBasicBlock to MachineCodeForBasicBlock.h. This class is now an annotation on BasicBlock. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2829 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/InstrSelection/InstrSelection.cpp | 7 ++++--- lib/Target/SparcV9/InstrSelection/InstrSelection.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/InstrSelection/InstrSelection.cpp b/lib/CodeGen/InstrSelection/InstrSelection.cpp index c43f8ddf84e..d61feb47979 100644 --- a/lib/CodeGen/InstrSelection/InstrSelection.cpp +++ b/lib/CodeGen/InstrSelection/InstrSelection.cpp @@ -18,6 +18,7 @@ #include "llvm/CodeGen/InstrSelectionSupport.h" #include "llvm/CodeGen/InstrForest.h" #include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "llvm/CodeGen/MachineCodeForBasicBlock.h" #include "llvm/CodeGen/MachineCodeForMethod.h" #include "llvm/Target/MachineRegInfo.h" #include "llvm/Target/TargetMachine.h" @@ -127,7 +128,7 @@ SelectInstructionsForMethod(Function *F, TargetMachine &target) for (BasicBlock::iterator II = BI->begin(); II != BI->end(); ++II) { MachineCodeForInstruction &mvec =MachineCodeForInstruction::get(II); for (unsigned i=0; i < mvec.size(); i++) - BI->getMachineInstrVec().push_back(mvec[i]); + MachineCodeForBasicBlock::get(BI).push_back(mvec[i]); } // Insert phi elimination code -- added by Ruchira @@ -162,7 +163,7 @@ InsertPhiElimInstructions(BasicBlock *BB, const std::vector& CpVe assert( FirstMIOfTerm && "No Machine Instrs for terminator" ); // get an iterator to machine instructions in the BB - MachineCodeForBasicBlock& bbMvec = BB->getMachineInstrVec(); + MachineCodeForBasicBlock& bbMvec = MachineCodeForBasicBlock::get(BB); MachineCodeForBasicBlock::iterator MCIt = bbMvec.begin(); // find the position of first machine instruction generated by the @@ -217,7 +218,7 @@ InsertCode4AllPhisInMeth(Function *F, TargetMachine &target) target.getRegInfo().cpValue2Value(PhiCpRes, PN, mvec); // get an iterator to machine instructions in the BB - MachineCodeForBasicBlock& bbMvec = BB->getMachineInstrVec(); + MachineCodeForBasicBlock& bbMvec = MachineCodeForBasicBlock::get(BB); bbMvec.insert(bbMvec.begin(), mvec.begin(), mvec.end()); } // for each Phi Instr in BB diff --git a/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp b/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp index c43f8ddf84e..d61feb47979 100644 --- a/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp +++ b/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp @@ -18,6 +18,7 @@ #include "llvm/CodeGen/InstrSelectionSupport.h" #include "llvm/CodeGen/InstrForest.h" #include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "llvm/CodeGen/MachineCodeForBasicBlock.h" #include "llvm/CodeGen/MachineCodeForMethod.h" #include "llvm/Target/MachineRegInfo.h" #include "llvm/Target/TargetMachine.h" @@ -127,7 +128,7 @@ SelectInstructionsForMethod(Function *F, TargetMachine &target) for (BasicBlock::iterator II = BI->begin(); II != BI->end(); ++II) { MachineCodeForInstruction &mvec =MachineCodeForInstruction::get(II); for (unsigned i=0; i < mvec.size(); i++) - BI->getMachineInstrVec().push_back(mvec[i]); + MachineCodeForBasicBlock::get(BI).push_back(mvec[i]); } // Insert phi elimination code -- added by Ruchira @@ -162,7 +163,7 @@ InsertPhiElimInstructions(BasicBlock *BB, const std::vector& CpVe assert( FirstMIOfTerm && "No Machine Instrs for terminator" ); // get an iterator to machine instructions in the BB - MachineCodeForBasicBlock& bbMvec = BB->getMachineInstrVec(); + MachineCodeForBasicBlock& bbMvec = MachineCodeForBasicBlock::get(BB); MachineCodeForBasicBlock::iterator MCIt = bbMvec.begin(); // find the position of first machine instruction generated by the @@ -217,7 +218,7 @@ InsertCode4AllPhisInMeth(Function *F, TargetMachine &target) target.getRegInfo().cpValue2Value(PhiCpRes, PN, mvec); // get an iterator to machine instructions in the BB - MachineCodeForBasicBlock& bbMvec = BB->getMachineInstrVec(); + MachineCodeForBasicBlock& bbMvec = MachineCodeForBasicBlock::get(BB); bbMvec.insert(bbMvec.begin(), mvec.begin(), mvec.end()); } // for each Phi Instr in BB