X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FMachineBasicBlock.cpp;h=20390a2f50e34d83ed7e98a9e654f4e50350d68c;hb=1484089bbf960f7191215dfa6c0bb51c8e30794e;hp=666d5477b3a8e34f55e60361a665f556a857fb24;hpb=55291ead559c902e46ddcebad50dbfefe50ec2d6;p=oota-llvm.git

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 666d5477b3a..20390a2f50e 100644
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -1,23 +1,107 @@
-//===-- MachineBasicBlock.cpp ---------------------------------------------===//
-// 
+//===-- llvm/CodeGen/MachineBasicBlock.cpp ----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
 // Collect the sequence of machine instructions for a basic block.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/BasicBlock.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/Target/TargetInstrInfo.h"
+#include "llvm/Target/TargetMachine.h"
+#include "Support/LeakDetector.h"
+#include <iostream>
+using namespace llvm;
+
+MachineBasicBlock::~MachineBasicBlock() {
+  LeakDetector::removeGarbageObject(this);
+}
+  
 
-AnnotationID MCFBB_AID(
-             AnnotationManager::getID("CodeGen::MachineBasicBlock"));
 
-static Annotation *CreateMCFBB(AnnotationID AID, const Annotable *, void *) {
-  assert(AID == MCFBB_AID);
-  return new MachineBasicBlock();  // Invoke constructor!
+// 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) {
+  assert(N->Parent == 0 && "machine instruction already in a basic block");
+  N->Parent = Parent;
+  N->Number = Parent->addToMBBNumbering(N);
+  LeakDetector::removeGarbageObject(N);
 }
 
-// Register the annotation with the annotation factory
-static struct MCFBBInitializer {
-  MCFBBInitializer() {
-    AnnotationManager::registerAnnotationFactory(MCFBB_AID, &CreateMCFBB);
-  }
-} RegisterCreateMCFBB;
+void ilist_traits<MachineBasicBlock>::removeNodeFromList(MachineBasicBlock* N) {
+  assert(N->Parent != 0 && "machine instruction not in a basic block");
+  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;
+}
 
+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>::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;
+}
+
+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::print(std::ostream &OS) const
+{
+  if(!getParent()) {
+    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*)this
+         << ", LLVM BB @" << (const void*) LBB << "):\n";
+    for (const_iterator I = begin(); I != end(); ++I) {
+        OS << "\t";
+        I->print(OS, &getParent()->getTarget());
+    }
+}