Fix order of eval problem from when I refactored this into a function.

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

diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index 903346d9146547f0266ab81f3a5029019b3537c2..f0ece6b3dbbec51691d853cc9e31875e03cfbc9b 100644 (file)
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -25,6 +25,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Support/LeakDetector.h"
 #include "llvm/Support/GraphWriter.h"
+#include "llvm/Config/config.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>
@@ -90,7 +91,7 @@ FunctionPass *llvm::createMachineCodeDeleter() {
 // MachineFunction implementation
 //===---------------------------------------------------------------------===//
 
-MachineBasicBlock* ilist_traits<MachineBasicBlock>::createSentinal() {
+MachineBasicBlock* ilist_traits<MachineBasicBlock>::createSentinel() {
   MachineBasicBlock* dummy = new MachineBasicBlock();
   LeakDetector::removeGarbageObject(dummy);
   return dummy;
@@ -134,7 +135,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);
 
@@ -184,6 +207,7 @@ namespace llvm {
 
 void MachineFunction::viewCFG() const
 {
+#ifndef NDEBUG
   std::string Filename = "/tmp/cfg." + getFunction()->getName() + ".dot";
   std::cerr << "Writing '" << Filename << "'... ";
   std::ofstream F(Filename.c_str());
@@ -197,6 +221,17 @@ void MachineFunction::viewCFG() const
   F.close();
   std::cerr << "\n";
 
+#ifdef HAVE_GRAPHVIZ
+  std::cerr << "Running 'Graphviz' program... " << std::flush;
+  if (system((LLVM_PATH_GRAPHVIZ " " + Filename).c_str())) {
+    std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
+  } else {
+    system(("rm " + Filename).c_str());
+    return;
+  }
+#endif  // HAVE_GRAPHVIZ
+
+#ifdef HAVE_GV
   std::cerr << "Running 'dot' program... " << std::flush;
   if (system(("dot -Tps -Nfontname=Courier -Gsize=7.5,10 " + Filename
               + " > /tmp/cfg.tempgraph.ps").c_str())) {
@@ -206,6 +241,15 @@ void MachineFunction::viewCFG() const
     system("gv /tmp/cfg.tempgraph.ps");
   }
   system(("rm " + Filename + " /tmp/cfg.tempgraph.ps").c_str());
+  return;
+#endif  // HAVE_GV
+#endif  // NDEBUG
+  std::cerr << "MachineFunction::viewCFG is only available in debug builds on "
+            << "systems with Graphviz or gv!\n";
+
+#ifndef NDEBUG
+  system(("rm " + Filename).c_str());
+#endif
 }
 
 void MachineFunction::viewCFGOnly() const
@@ -256,7 +300,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));
 }
 
@@ -266,11 +310,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";