Rename MachineCodeForBasicBlock to MachineBasicBlock
llvm-svn: 4318
diff --git a/llvm/lib/Target/Sparc/EmitAssembly.cpp b/llvm/lib/Target/Sparc/EmitAssembly.cpp
index f414347..3c4dfb2 100644
--- a/llvm/lib/Target/Sparc/EmitAssembly.cpp
+++ b/llvm/lib/Target/Sparc/EmitAssembly.cpp
@@ -13,7 +13,7 @@
#include "SparcInternals.h"
#include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/CodeGen/MachineCodeForBasicBlock.h"
+#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
@@ -469,11 +469,11 @@
toAsm << getID(BB) << ":\n";
// Get the vector of machine instructions corresponding to this bb.
- const MachineCodeForBasicBlock &MIs = MachineCodeForBasicBlock::get(BB);
- MachineCodeForBasicBlock::const_iterator MII = MIs.begin(), MIE = MIs.end();
+ const MachineBasicBlock &MIs = MachineBasicBlock::get(BB);
// Loop over all of the instructions in the basic block...
- for (; MII != MIE; ++MII)
+ for (MachineBasicBlock::const_iterator MII = MIs.begin(), MIE = MIs.end();
+ MII != MIE; ++MII)
emitMachineInst(*MII);
toAsm << "\n"; // Seperate BB's with newlines
}
diff --git a/llvm/lib/Target/Sparc/MappingInfo.cpp b/llvm/lib/Target/Sparc/MappingInfo.cpp
index e207c20..087fba2 100644
--- a/llvm/lib/Target/Sparc/MappingInfo.cpp
+++ b/llvm/lib/Target/Sparc/MappingInfo.cpp
@@ -10,7 +10,7 @@
#include "llvm/Pass.h"
#include "llvm/Module.h"
#include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/CodeGen/MachineCodeForBasicBlock.h"
+#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineCodeForInstruction.h"
#include <map>
using std::vector;
@@ -126,7 +126,7 @@
unsigned i = 0;
for (Function::iterator BI = FI.begin(), BE = FI.end();
BI != BE; ++BI){
- MachineCodeForBasicBlock &miBB = MachineCodeForBasicBlock::get(BI);
+ MachineBasicBlock &miBB = MachineBasicBlock::get(BI);
BBkey[miBB[0]] = i;
i = i+(miBB.size());
}
@@ -136,9 +136,9 @@
void getMappingInfoForFunction::create_MI_to_number_Key(Function &FI){
for (Function::iterator BI=FI.begin(), BE=FI.end();
BI != BE; ++BI){
- MachineCodeForBasicBlock &miBB = MachineCodeForBasicBlock::get(BI);
+ MachineBasicBlock &miBB = MachineBasicBlock::get(BI);
unsigned j = 0;
- for(MachineCodeForBasicBlock::iterator miI=miBB.begin(), miE=miBB.end();
+ for(MachineBasicBlock::iterator miI=miBB.begin(), miE=miBB.end();
miI!=miE; ++miI, ++j){
MIkey[*miI]=j;
}
@@ -151,7 +151,7 @@
unsigned bb=0;
for (Function::iterator BI = FI.begin(),
BE = FI.end(); BI != BE; ++BI, ++bb){
- MachineCodeForBasicBlock &miBB = MachineCodeForBasicBlock::get(BI);
+ MachineBasicBlock &miBB = MachineBasicBlock::get(BI);
writeNumber(bb);
//Out << " BB: "<<(void *)BI<<"\n";
//for(int i=0; i<miBB.size(); ++i)
diff --git a/llvm/lib/Target/Sparc/PeepholeOpts.cpp b/llvm/lib/Target/Sparc/PeepholeOpts.cpp
index fb83cbb..b41290e 100644
--- a/llvm/lib/Target/Sparc/PeepholeOpts.cpp
+++ b/llvm/lib/Target/Sparc/PeepholeOpts.cpp
@@ -1,16 +1,12 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-// PeepholeOpts.h
+//===-- PeepholeOpts.cpp --------------------------------------------------===//
//
-// Purpose:
-// Support for performing several peephole opts in one or a few passes
-// over the machine code of a method.
-//**************************************************************************/
-
+// Support for performing several peephole opts in one or a few passes over the
+// machine code of a method.
+//
+//===----------------------------------------------------------------------===//
#include "llvm/CodeGen/PeepholeOpts.h"
-#include "llvm/CodeGen/MachineCodeForBasicBlock.h"
+#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/MachineInstrInfo.h"
@@ -18,15 +14,11 @@
#include "llvm/BasicBlock.h"
#include "llvm/Pass.h"
-
-//********************* Internal Class Declarations ************************/
-
-
//************************* Internal Functions *****************************/
inline void
-DeleteInstruction(MachineCodeForBasicBlock& mvec,
- MachineCodeForBasicBlock::iterator& BBI,
+DeleteInstruction(MachineBasicBlock& mvec,
+ MachineBasicBlock::iterator& BBI,
const TargetMachine& target)
{
// Check if this instruction is in a delay slot of its predecessor.
@@ -55,8 +47,8 @@
inline bool
-RemoveUselessCopies(MachineCodeForBasicBlock& mvec,
- MachineCodeForBasicBlock::iterator& BBI,
+RemoveUselessCopies(MachineBasicBlock& mvec,
+ MachineBasicBlock::iterator& BBI,
const TargetMachine& target)
{
if (target.getOptInfo().IsUselessCopy(*BBI))
@@ -72,8 +64,8 @@
class PeepholeOpts: public BasicBlockPass {
const TargetMachine ⌖
- bool visit(MachineCodeForBasicBlock& mvec,
- MachineCodeForBasicBlock::iterator BBI) const;
+ bool visit(MachineBasicBlock& mvec,
+ MachineBasicBlock::iterator BBI) const;
public:
PeepholeOpts(const TargetMachine &T): target(T) { }
bool runOnBasicBlock(BasicBlock &BB); // apply this pass to each BB
@@ -90,8 +82,8 @@
* instruction before MI, but not
*/
bool
-PeepholeOpts::visit(MachineCodeForBasicBlock& mvec,
- MachineCodeForBasicBlock::iterator BBI) const
+PeepholeOpts::visit(MachineBasicBlock& mvec,
+ MachineBasicBlock::iterator BBI) const
{
bool changed = false;
@@ -108,16 +100,16 @@
PeepholeOpts::runOnBasicBlock(BasicBlock &BB)
{
// Get the machine instructions for this BB
- MachineCodeForBasicBlock& mvec = MachineCodeForBasicBlock::get(&BB);
+ MachineBasicBlock& mvec = MachineBasicBlock::get(&BB);
// Iterate over all machine instructions in the BB
// Use a reverse iterator to allow deletion of MI or any instruction after it.
// Insertions or deletions *before* MI are not safe.
//
- for (MachineCodeForBasicBlock::reverse_iterator RI=mvec.rbegin(),
+ for (MachineBasicBlock::reverse_iterator RI=mvec.rbegin(),
RE=mvec.rend(); RI != RE; )
{
- MachineCodeForBasicBlock::iterator BBI = RI.base()-1; // save before incr
+ MachineBasicBlock::iterator BBI = RI.base()-1; // save before incr
++RI; // pre-increment to delete MI or after it
visit(mvec, BBI);
}
diff --git a/llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp b/llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp
index adb1490..bc6514f 100644
--- a/llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp
+++ b/llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp
@@ -12,7 +12,7 @@
#include "SparcInternals.h"
#include "SparcRegClassInfo.h"
#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineCodeForBasicBlock.h"
+#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineCodeForInstruction.h"
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/CodeGen/InstrSelectionSupport.h"
@@ -118,7 +118,7 @@
mvec.push_back(M);
}
- MachineCodeForBasicBlock& bbMvec = MachineCodeForBasicBlock::get(&F.getEntryNode());
+ MachineBasicBlock& bbMvec = MachineBasicBlock::get(&F.getEntryNode());
bbMvec.insert(bbMvec.begin(), mvec.begin(), mvec.end());
}
@@ -134,7 +134,7 @@
(int64_t)0);
Restore->SetMachineOperandReg(2, Target.getRegInfo().getZeroRegNum());
- MachineCodeForBasicBlock& bbMvec = MachineCodeForBasicBlock::get(I);
+ MachineBasicBlock& bbMvec = MachineBasicBlock::get(I);
MachineCodeForInstruction &termMvec =
MachineCodeForInstruction::get(TermInst);