Mercurial > hg > truffle
changeset 6510:fbcbb6ba16cd
javadoc and visualizer fixes
| author | Lukas Stadler <lukas.stadler@jku.at> |
|---|---|
| date | Fri, 05 Oct 2012 09:01:20 +0200 |
| parents | 534c45127aad |
| children | 0b62a9d44c21 |
| files | graal/com.oracle.graal.compiler.virtual/src/com/oracle/graal/nodes/virtual/CyclicMaterializeStoreNode.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java graal/com.oracle.graal.nodes/src/com/oracle/graal/lir/cfg/Loop.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java |
| diffstat | 5 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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 {
--- 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;
--- 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; }
--- 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); }