Fix spilled interval update. It was too conservative.

[oota-llvm.git] / lib / CodeGen / MachineBasicBlock.cpp

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 666d5477b3a8e34f55e60361a665f556a857fb24..93606931868814019299e2c888d1115480d85afa 100644 (file)
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -1,23 +1,68 @@
-//===-- 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"
 
-AnnotationID MCFBB_AID(
-             AnnotationManager::getID("CodeGen::MachineBasicBlock"));
+#include "llvm/BasicBlock.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "Support/LeakDetector.h"
+#include <iostream>
+
+using namespace llvm;
+
+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);
+}
 
-static Annotation *CreateMCFBB(AnnotationID AID, const Annotable *, void *) {
-  assert(AID == MCFBB_AID);
-  return new MachineBasicBlock();  // Invoke constructor!
+void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr* N)
+{
+    assert(N->parent != 0 && "machine instruction not in a basic block");
+    N->parent = 0;
+    LeakDetector::addGarbageObject(N);
 }
 
-// Register the annotation with the annotation factory
-static struct MCFBBInitializer {
-  MCFBBInitializer() {
-    AnnotationManager::registerAnnotationFactory(MCFBB_AID, &CreateMCFBB);
-  }
-} RegisterCreateMCFBB;
+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;
+}
 
+void MachineBasicBlock::dump() const
+{
+    print(std::cerr);
+}
+
+void MachineBasicBlock::print(std::ostream &OS) const
+{
+    const BasicBlock *LBB = getBasicBlock();
+    OS << "\n" << LBB->getName() << " (" << (const void*)LBB << "):\n";
+    for (const_iterator I = begin(); I != end(); ++I) {
+        OS << "\t";
+        I->print(OS, MachineFunction::get(LBB->getParent()).getTarget());
+    }
+}