Second step for computing SSA: renaming.

vm/il_printer.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/il_printer.h"
 
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 
 namespace dart {
@@ skipping 68 matching lines @@
 
 void Computation::PrintOperandsTo(BufferFormatter* f) const {
   for (int i = 0; i < InputCount(); ++i) {
     if (i > 0) f->Print(", ");
     if (InputAt(i) != NULL) InputAt(i)->PrintTo(f);
   }
 }
 
 
 void UseVal::PrintTo(BufferFormatter* f) const {
-  f->Print("t%d", definition()->temp_index());
+  if (definition()->ssa_temp_index() != -1) {
+    f->Print("t%d", definition()->ssa_temp_index());
+  } else {
+    f->Print("t%d", definition()->temp_index());
+  }
 }
 
 
 void ConstantVal::PrintTo(BufferFormatter* f) const {
   f->Print("#%s", value().ToCString());
 }
 
 
 void AssertAssignableComp::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
@@ skipping 225 matching lines @@
 
 void ToDoubleComp::PrintOperandsTo(BufferFormatter* f) const {
   ASSERT(from() == kDouble || from() == kSmi);
   f->Print("%s ", from() == kDouble ? "double2double" : "smi2double");
   value()->PrintTo(f);
 }
 
 
 void GraphEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [graph]", block_id());
+  if (start_env_ != NULL) {
+    for (intptr_t i = 0; i < start_env_->length(); ++i) {
+      f->Print("\n  ");
+      (*start_env_)[i]->PrintTo(f);
+    }
+  }
 }
 
 
 void JoinEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [join]", block_id());
   if (phis_ != NULL) {
     for (intptr_t i = 0; i < phis_->length(); ++i) {
       if ((*phis_)[i] == NULL) continue;
       f->Print("\n");
       (*phis_)[i]->PrintTo(f);
     }
   }
 }
 
 
 void PhiInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("     phi(");
+  f->Print("    t%d <- phi(", ssa_temp_index());
   for (intptr_t i = 0; i < inputs_.length(); ++i) {
     if (inputs_[i] != NULL) inputs_[i]->PrintTo(f);
     if (i < inputs_.length() - 1) f->Print(",");
   }
   f->Print(")");
 }
 
 
 void TargetEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [target", block_id());
   if (HasTryIndex()) {
     f->Print(" catch %d]", try_index());
   } else {
     f->Print("]");
   }
 }
 
 
 void DoInstr::PrintTo(BufferFormatter* f) const {
   f->Print("    ");
   computation()->PrintTo(f);
 }
 
 
 void BindInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("    t%d <- ", temp_index());
+  if (ssa_temp_index() != -1) {
+    f->Print("    t%d <- ", ssa_temp_index());
+  } else {
+    f->Print("    t%d <- ", temp_index());
+  }
   computation()->PrintTo(f);
 }
 
 
 void ReturnInstr::PrintTo(BufferFormatter* f) const {
   f->Print("    %s ", DebugName());
   value()->PrintTo(f);
 }
 
 
@@ skipping 33 matching lines @@
   f.VPrint(format, args);
   va_end(args);
   (*Dart::flow_graph_writer())(str, strlen(str));
 }
 
 
 void FlowGraphVisualizer::PrintInstruction(Instruction* instr) {
   char str[120];
   BufferFormatter f(str, sizeof(str));
   instr->PrintToVisualizer(&f);
-  f.Print("%s <|@\n", str);
+  f.Print(" <|@\n");
   (*Dart::flow_graph_writer())(str, strlen(str));
 }
 
 
 void FlowGraphVisualizer::PrintFunction() {
 #define BEGIN(name)          \
   Print("begin_%s\n", name); \
   indent_++;
 #define END(name)          \
   Print("end_%s\n", name); \
@@ skipping 107 matching lines @@
   f->Print("_ [graph]");
 }
 
 
 void JoinEntryInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ [join]");
 }
 
 
 void PhiInstr::PrintToVisualizer(BufferFormatter* f) const {
-  // TODO(fschneider): Print operands when SSA renaming is implemented.
-  f->Print("v [");
+  f->Print("t%d [", ssa_temp_index());
+  bool has_constant = false;
   for (intptr_t i = 0; i < InputCount(); ++i) {
-    f->Print(" v ");
+    if (i > 0) f->Print(" ");
+    if (InputAt(i)->IsConstant()) {
+      f->Print("const");
+      has_constant = true;
+    } else {
+      InputAt(i)->PrintTo(f);
+    }
   }
   f->Print("]");
+  // The vizualizer file format does not allow arbitrary strings inside the phi.
+  // Print constants as a line-end comment instead.
+  if (has_constant) {
+    f->Print("\"");
+    for (intptr_t i = 0; i < InputCount(); ++i) {
+      if (i > 0) f->Print(" ");
+      if (InputAt(i)->IsConstant()) {
+        InputAt(i)->PrintTo(f);
+      }
+    }
+    f->Print("\"");
+  }
 }
 
 
 void TargetEntryInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ [target");
   if (HasTryIndex()) {
     f->Print(" catch %d]", try_index());
   } else {
     f->Print("]");
   }
 }
 
 
 void DoInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ ");
   computation()->PrintTo(f);
 }
 
 
 void BindInstr::PrintToVisualizer(BufferFormatter* f) const {
-  f->Print("t%d ", temp_index());
+  if (ssa_temp_index() != -1) {
+    f->Print("t%d ", ssa_temp_index());
+  } else {
+    f->Print("t%d ", temp_index());
+  }
   computation()->PrintTo(f);
 }
 
 
 void ReturnInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ %s ", DebugName());
   value()->PrintTo(f);
 }
 
 
@@ skipping 15 matching lines @@
   f->Print("_ %s ", DebugName());
   f->Print("if ");
   value()->PrintTo(f);
   f->Print(" goto (B%d, B%d)",
             true_successor()->block_id(),
             false_successor()->block_id());
 }
 
 
 }  // namespace dart