#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetMachine.h"
#include "Support/LeakDetector.h"
+#include <iostream>
using namespace llvm;
+MachineBasicBlock::~MachineBasicBlock() {
+ LeakDetector::removeGarbageObject(this);
+}
+
+
+
// 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->Parent = Parent;
+ 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* ilist_traits<MachineInstr>::createNode() {
MachineInstr* dummy = new MachineInstr(0, 0);
LeakDetector::removeGarbageObject(dummy);
return dummy;
MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator()
{
- const TargetInstrInfo& TII = getParent()->getTarget().getInstrInfo();
+ const TargetInstrInfo& TII = *getParent()->getTarget().getInstrInfo();
iterator I = end();
while (I != begin() && TII.isTerminatorInstr((--I)->getOpcode()));
if (I != end() && !TII.isTerminatorInstr(I->getOpcode())) ++I;
}
const BasicBlock *LBB = getBasicBlock();
if(LBB)
- OS << "\n" << LBB->getName() << " (" << (const void*)LBB << "):\n";
+ 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());
+ I->print(OS, &getParent()->getTarget());
}
}