Fix VC++ warnings.

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

diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index f19ea0918f0b1f521620f8bc22544335791c6760..2e3088c7e3b1ac9adacc799390632e289d4ef927 100644 (file)
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -89,8 +89,8 @@ FunctionPass *llvm::createMachineCodeDeleter() {
 //===---------------------------------------------------------------------===//
 // MachineFunction implementation
 //===---------------------------------------------------------------------===//
-MachineBasicBlock* ilist_traits<MachineBasicBlock>::createNode()
-{
+
+MachineBasicBlock* ilist_traits<MachineBasicBlock>::createSentinel() {
   MachineBasicBlock* dummy = new MachineBasicBlock();
   LeakDetector::removeGarbageObject(dummy);
   return dummy;
@@ -99,8 +99,7 @@ MachineBasicBlock* ilist_traits<MachineBasicBlock>::createNode()
 void ilist_traits<MachineBasicBlock>::transferNodesFromList(
   iplist<MachineBasicBlock, ilist_traits<MachineBasicBlock> >& toList,
   ilist_iterator<MachineBasicBlock> first,
-  ilist_iterator<MachineBasicBlock> last)
-{
+  ilist_iterator<MachineBasicBlock> last) {
   if (Parent != toList.Parent)
     for (; first != last; ++first)
       first->Parent = toList.Parent;
@@ -135,7 +134,29 @@ void MachineFunction::print(std::ostream &OS) const {
 
   // Print Constant Pool
   getConstantPool()->print(OS);
-
+  
+  const MRegisterInfo *MRI = getTarget().getRegisterInfo();
+  
+  if (livein_begin() != livein_end()) {
+    OS << "Live Ins:";
+    for (livein_iterator I = livein_begin(), E = livein_end(); I != E; ++I) {
+      if (MRI)
+        OS << " " << MRI->getName(I->first);
+      else
+        OS << " Reg #" << I->first;
+    }
+    OS << "\n";
+  }
+  if (liveout_begin() != liveout_end()) {
+    OS << "Live Outs:";
+    for (liveout_iterator I = liveout_begin(), E = liveout_end(); I != E; ++I)
+      if (MRI)
+        OS << " " << MRI->getName(*I);
+      else
+        OS << " Reg #" << *I;
+    OS << "\n";
+  }
+  
   for (const_iterator BB = begin(); BB != end(); ++BB)
     BB->print(OS);
 
@@ -257,7 +278,7 @@ void MachineFunction::clearSSARegMap() {
 /// CreateStackObject - Create a stack object for a value of the specified type.
 ///
 int MachineFrameInfo::CreateStackObject(const Type *Ty, const TargetData &TD) {
-  return CreateStackObject((unsigned)TD.getTypeSize(Ty), 
+  return CreateStackObject((unsigned)TD.getTypeSize(Ty),
                            TD.getTypeAlignment(Ty));
 }
 
@@ -267,11 +288,13 @@ void MachineFrameInfo::print(const MachineFunction &MF, std::ostream &OS) const{
 
   for (unsigned i = 0, e = Objects.size(); i != e; ++i) {
     const StackObject &SO = Objects[i];
-    OS << "  <fi #" << (int)(i-NumFixedObjects) << "> is ";
+    OS << "  <fi #" << (int)(i-NumFixedObjects) << ">: ";
     if (SO.Size == 0)
       OS << "variable sized";
     else
-      OS << SO.Size << " byte" << (SO.Size != 1 ? "s" : " ");
+      OS << "size is " << SO.Size << " byte" << (SO.Size != 1 ? "s," : ",");
+    OS << " alignment is " << SO.Alignment << " byte"
+       << (SO.Alignment != 1 ? "s," : ",");
 
     if (i < NumFixedObjects)
       OS << " fixed";