X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FMachineBasicBlock.cpp;h=695ba13a49ddf58bc7880ebf9c76696380880e4f;hb=ef9531efedd2233269f670227fb0e6aae7480d53;hp=c72b247d8a47b47937c65cc692da4cc4945df3a0;hpb=17fb34bf8cd10a798c9206eeef3bff151b4d3688;p=oota-llvm.git

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index c72b247d8a4..695ba13a49d 100644
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -17,93 +17,124 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
+#include <iostream>
+#include <algorithm>
 using namespace llvm;
 
 MachineBasicBlock::~MachineBasicBlock() {
   LeakDetector::removeGarbageObject(this);
 }
-  
 
 
-// MBBs start out as #-1. When a MBB is added to a MachineFunction, it 
+// MBBs start out as #-1. When a MBB is added to a MachineFunction, it
 // gets the next available unique MBB number. If it is removed from a
 // MachineFunction, it goes back to being #-1.
-void ilist_traits<MachineBasicBlock>::addNodeToList (MachineBasicBlock* N)
-{
+void ilist_traits<MachineBasicBlock>::addNodeToList(MachineBasicBlock* N) {
   assert(N->Parent == 0 && "machine instruction already in a basic block");
   N->Parent = Parent;
-  N->Number = Parent->getNextMBBNumber();
+  N->Number = Parent->addToMBBNumbering(N);
   LeakDetector::removeGarbageObject(N);
-  
-
 }
 
-void ilist_traits<MachineBasicBlock>::removeNodeFromList (MachineBasicBlock* N)
-{
+void ilist_traits<MachineBasicBlock>::removeNodeFromList(MachineBasicBlock* N) {
   assert(N->Parent != 0 && "machine instruction not in a basic block");
-  N->Parent = 0;
+  N->Parent->removeFromMBBNumbering(N->Number);
   N->Number = -1;
+  N->Parent = 0;
   LeakDetector::addGarbageObject(N);
 }
 
 
-MachineInstr* ilist_traits<MachineInstr>::createNode()
-{
-    MachineInstr* dummy = new MachineInstr(0, 0);
-    LeakDetector::removeGarbageObject(dummy);
-    return dummy;
+MachineInstr* ilist_traits<MachineInstr>::createSentinel() {
+  MachineInstr* dummy = new MachineInstr(0, 0);
+  LeakDetector::removeGarbageObject(dummy);
+  return dummy;
 }
 
-void ilist_traits<MachineInstr>::addNodeToList(MachineInstr* N)
-{
-    assert(N->parent == 0 && "machine instruction already in a basic block");
-    N->parent = parent;
-    LeakDetector::removeGarbageObject(N);
+void ilist_traits<MachineInstr>::addNodeToList(MachineInstr* N) {
+  assert(N->parent == 0 && "machine instruction already in a basic block");
+  N->parent = parent;
+  LeakDetector::removeGarbageObject(N);
 }
 
-void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr* N)
-{
-    assert(N->parent != 0 && "machine instruction not in a basic block");
-    N->parent = 0;
-    LeakDetector::addGarbageObject(N);
+void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr* N) {
+  assert(N->parent != 0 && "machine instruction not in a basic block");
+  N->parent = 0;
+  LeakDetector::addGarbageObject(N);
 }
 
 void ilist_traits<MachineInstr>::transferNodesFromList(
-    iplist<MachineInstr, ilist_traits<MachineInstr> >& toList,
-    ilist_iterator<MachineInstr> first,
-    ilist_iterator<MachineInstr> last)
-{
-    if (parent != toList.parent)
-        for (; first != last; ++first)
-            first->parent = toList.parent;
+  iplist<MachineInstr, ilist_traits<MachineInstr> >& toList,
+  ilist_iterator<MachineInstr> first,
+  ilist_iterator<MachineInstr> last) {
+  if (parent != toList.parent)
+    for (; first != last; ++first)
+      first->parent = toList.parent;
 }
 
-MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator()
-{
-  const TargetInstrInfo& TII = getParent()->getTarget().getInstrInfo();
+MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
+  const TargetInstrInfo& TII = *getParent()->getTarget().getInstrInfo();
   iterator I = end();
   while (I != begin() && TII.isTerminatorInstr((--I)->getOpcode()));
   if (I != end() && !TII.isTerminatorInstr(I->getOpcode())) ++I;
   return I;
 }
 
-void MachineBasicBlock::dump() const
-{
-    print(std::cerr);
+void MachineBasicBlock::dump() const {
+  print(std::cerr);
 }
 
-void MachineBasicBlock::print(std::ostream &OS) const
-{
+void MachineBasicBlock::print(std::ostream &OS) const {
   if(!getParent()) {
-    OS << "Can't print out MachineBasicBlock because parent MachineFunction is null\n";
+    OS << "Can't print out MachineBasicBlock because parent MachineFunction"
+       << " is null\n";
     return;
   }
-    const BasicBlock *LBB = getBasicBlock();
-    if(LBB)
-      OS << "\n" << LBB->getName() << " (" << (const void*)LBB << "):\n";
-    for (const_iterator I = begin(); I != end(); ++I) {
-        OS << "\t";
-        I->print(OS, getParent()->getTarget());
-    }
+
+  const BasicBlock *LBB = getBasicBlock();
+  if (LBB)
+    OS << "\n" << LBB->getName() << " (" << (const void*)this
+       << ", LLVM BB @" << (const void*) LBB << "):\n";
+  for (const_iterator I = begin(); I != end(); ++I) {
+    OS << "\t";
+    I->print(OS, &getParent()->getTarget());
+  }
+
+  // Print the successors of this block according to the CFG.
+  if (!succ_empty()) {
+    OS << "    Successors according to CFG:";
+    for (const_succ_iterator SI = succ_begin(), E = succ_end(); SI != E; ++SI)
+      OS << " " << *SI;
+    OS << "\n";
+  }
+}
+
+void MachineBasicBlock::addSuccessor(MachineBasicBlock *succ) {
+  Successors.push_back(succ);
+  succ->addPredecessor(this);
+}
+
+void MachineBasicBlock::removeSuccessor(MachineBasicBlock *succ) {
+  succ->removePredecessor(this);
+  succ_iterator I = std::find(Successors.begin(), Successors.end(), succ);
+  assert(I != Successors.end() && "Not a current successor!");
+  Successors.erase(I);
+}
+
+void MachineBasicBlock::removeSuccessor(succ_iterator I) {
+  assert(I != Successors.end() && "Not a current successor!");
+  (*I)->removePredecessor(this);
+  Successors.erase(I);
+}
+
+void MachineBasicBlock::addPredecessor(MachineBasicBlock *pred) {
+  Predecessors.push_back(pred);
+}
+
+void MachineBasicBlock::removePredecessor(MachineBasicBlock *pred) {
+  std::vector<MachineBasicBlock *>::iterator I = 
+    std::find(Predecessors.begin(), Predecessors.end(), pred);
+  assert(I != Predecessors.end() && "Pred is not a predecessor of this block!");
+  Predecessors.erase(I);
 }