[llvm-commits] CVS: llvm/lib/Target/Sparc/EmitAssembly.cpp PrologEpilogCodeInserter.cpp

[Misha Brukman]

Changes in directory llvm/lib/Target/Sparc:

EmitAssembly.cpp updated: 1.67 -> 1.68
PrologEpilogCodeInserter.cpp updated: 1.17 -> 1.18

---
Log message:

Rewrote uses of deprecated `MachineFunction::get(BasicBlock *BB)'.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/EmitAssembly.cpp
diff -u llvm/lib/Target/Sparc/EmitAssembly.cpp:1.67 llvm/lib/Target/Sparc/EmitAssembly.cpp:1.68
--- llvm/lib/Target/Sparc/EmitAssembly.cpp:1.67	Sun Oct 27 22:45:29 2002
+++ llvm/lib/Target/Sparc/EmitAssembly.cpp	Mon Oct 28 14:01:13 2002
@@ -294,7 +294,7 @@
 
   void emitFunction(const Function &F);
 private :
-  void emitBasicBlock(const BasicBlock *BB);
+  void emitBasicBlock(const MachineBasicBlock &MBB);
   void emitMachineInst(const MachineInstr *MI);
   
   unsigned int printOperands(const MachineInstr *MI, unsigned int opNum);
@@ -462,16 +462,13 @@
 }
 
 void
-SparcFunctionAsmPrinter::emitBasicBlock(const BasicBlock *BB)
+SparcFunctionAsmPrinter::emitBasicBlock(const MachineBasicBlock &MBB)
 {
   // Emit a label for the basic block
-  toAsm << getID(BB) << ":\n";
-
-  // Get the vector of machine instructions corresponding to this bb.
-  const MachineBasicBlock &MIs = MachineBasicBlock::get(BB);
+  toAsm << getID(MBB.getBasicBlock()) << ":\n";
 
   // Loop over all of the instructions in the basic block...
-  for (MachineBasicBlock::const_iterator MII = MIs.begin(), MIE = MIs.end();
+  for (MachineBasicBlock::const_iterator MII = MBB.begin(), MIE = MBB.end();
        MII != MIE; ++MII)
     emitMachineInst(*MII);
   toAsm << "\n";  // Seperate BB's with newlines
@@ -489,8 +486,9 @@
   toAsm << methName << ":\n";
 
   // Output code for all of the basic blocks in the function...
-  for (Function::const_iterator I = F.begin(), E = F.end(); I != E; ++I)
-    emitBasicBlock(I);
+  MachineFunction &MF = MachineFunction::get(&F);
+  for (MachineFunction::const_iterator I = MF.begin(), E = MF.end(); I != E; ++I)
+    emitBasicBlock(*I);
 
   // Output a .size directive so the debugger knows the extents of the function
   toAsm << ".EndOf_" << methName << ":\n\t.size "


Index: llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp
diff -u llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp:1.17 llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp:1.18
--- llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp:1.17	Sun Oct 27 20:01:37 2002
+++ llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp	Mon Oct 28 14:01:13 2002
@@ -117,14 +117,17 @@
       mvec.push_back(M);
     }
 
-  MachineBasicBlock& bbMvec = MachineBasicBlock::get(&F.getEntryNode());
+  MachineBasicBlock& bbMvec = mcInfo.front();
   bbMvec.insert(bbMvec.begin(), mvec.begin(), mvec.end());
 }
 
 void InsertPrologEpilogCode::InsertEpilogCode(Function &F)
 {
-  for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) {
-    Instruction *TermInst = (Instruction*)I->getTerminator();
+  MachineFunction &MF = MachineFunction::get(&F);
+  for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I) {
+    MachineBasicBlock &MBB = *I;
+    BasicBlock &BB = *I->getBasicBlock();
+    Instruction *TermInst = (Instruction*)BB.getTerminator();
     if (TermInst->getOpcode() == Instruction::Ret)
       {
         MachineInstr *Restore = new MachineInstr(RESTORE);
@@ -133,7 +136,6 @@
                                         (int64_t)0);
         Restore->SetMachineOperandReg(2, Target.getRegInfo().getZeroRegNum());
         
-        MachineBasicBlock& bbMvec = MachineBasicBlock::get(I);
         MachineCodeForInstruction &termMvec =
           MachineCodeForInstruction::get(TermInst);
         
@@ -142,12 +144,12 @@
         unsigned numNOPs = 0;
         while (termMvec.back()->getOpCode() == NOP)
           {
-            assert( termMvec.back() == bbMvec.back());
-            delete bbMvec.pop_back();
+            assert( termMvec.back() == MBB.back());
+            delete MBB.pop_back();
             termMvec.pop_back();
             ++numNOPs;
           }
-        assert(termMvec.back() == bbMvec.back());
+        assert(termMvec.back() == MBB.back());
         
         // Check that we found the right number of NOPs and have the right
         // number of instructions to replace them.
@@ -156,7 +158,7 @@
         assert(ndelays == 1 && "Cannot use epilog code for delay slots?");
         
         // Append the epilog code to the end of the basic block.
-        bbMvec.push_back(Restore);
+        MBB.push_back(Restore);
       }
   }
 }