# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1349420480 -7200
# Node ID fbcbb6ba16cd7256e33a2934957c4751192a696b
# Parent  534c45127aadff121e0fb90298d763cf48e05552
javadoc and visualizer fixes

diff -r 534c45127aad -r fbcbb6ba16cd graal/com.oracle.graal.compiler.virtual/src/com/oracle/graal/nodes/virtual/CyclicMaterializeStoreNode.java
--- a/graal/com.oracle.graal.compiler.virtual/src/com/oracle/graal/nodes/virtual/CyclicMaterializeStoreNode.java	Thu Oct 04 19:54:22 2012 +0200
+++ b/graal/com.oracle.graal.compiler.virtual/src/com/oracle/graal/nodes/virtual/CyclicMaterializeStoreNode.java	Fri Oct 05 09:01:20 2012 +0200
@@ -32,7 +32,7 @@
 /**
  * The {@code StoreFieldNode} represents a write to a static or instance field.
  */
-@NodeInfo(nameTemplate = "MaterializeStore#{p#field/s}")
+@NodeInfo(nameTemplate = "MaterializeStore#{p#target/s}")
 public final class CyclicMaterializeStoreNode extends FixedWithNextNode implements Lowerable {
 
     @Input private ValueNode object;
diff -r 534c45127aad -r fbcbb6ba16cd graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java	Thu Oct 04 19:54:22 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java	Fri Oct 05 09:01:20 2012 +0200
@@ -117,14 +117,14 @@
             values[numLocals + i] = toValue(state.stackAt(i));
         }
         for (int i = 0; i < numLocks; i++) {
-            // frames are traversed from the outside in, so the locks for the current frame are at the end of the lockDataSlot list
+            // frames are traversed from the outside in, so the locks for the current frame are at the end of the lockDataSlots list
             StackSlot lockData = lockDataSlots.get(lockDataSlots.size() - numLocks + i);
             values[numLocals + numStack + i] = new MonitorValue(toValue(state.lockAt(i)), lockData, state.lockAt(i) instanceof VirtualObjectNode);
         }
 
         BytecodeFrame caller = null;
         if (state.outerFrameState() != null) {
-            // remove the locks that were used for this frame from the list
+            // remove the locks that were used for this frame from the lockDataSlots list
             List<StackSlot> nextLockDataSlots = lockDataSlots.subList(0, lockDataSlots.size() - numLocks);
             caller = computeFrameForState(state.outerFrameState(), nextLockDataSlots, -1);
         } else {
diff -r 534c45127aad -r fbcbb6ba16cd graal/com.oracle.graal.nodes/src/com/oracle/graal/lir/cfg/Loop.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/lir/cfg/Loop.java	Thu Oct 04 19:54:22 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/lir/cfg/Loop.java	Fri Oct 05 09:01:20 2012 +0200
@@ -27,6 +27,7 @@
 import com.oracle.graal.nodes.*;
 
 public class Loop {
+
     public final Loop parent;
     public final List<Loop> children;
 
diff -r 534c45127aad -r fbcbb6ba16cd graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java	Thu Oct 04 19:54:22 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java	Fri Oct 05 09:01:20 2012 +0200
@@ -81,6 +81,12 @@
         return super.verify();
     }
 
+    /**
+     * Returns the 0-based index of this loop end. This is <b>not</b> the index into {@link PhiNode} values at the loop
+     * begin. Use {@link MergeNode#phiPredecessorIndex(EndNode)} for this purpose.
+     *
+     * @return The 0-based index of this loop end.
+     */
     public int endIndex() {
         return endIndex;
     }
diff -r 534c45127aad -r fbcbb6ba16cd graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java	Thu Oct 04 19:54:22 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java	Fri Oct 05 09:01:20 2012 +0200
@@ -60,7 +60,7 @@
     @Override
     public String toString(Verbosity verbosity) {
         if (verbosity == Verbosity.Name) {
-            return super.toString(Verbosity.Name) + " " + type.name();
+            return super.toString(Verbosity.Name) + " " + MetaUtil.toJavaName(type, false);
         } else {
             return super.toString(verbosity);
         }