Mercurial > hg > truffle
changeset 3715:3f6325ddd391
Merge
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Tue, 13 Dec 2011 21:18:25 -0800 |
parents | b648304ba4ff (current diff) 6a2ef9284a28 (diff) |
children | 82f88223fcff |
files | |
diffstat | 4 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java Tue Dec 13 21:17:46 2011 -0800 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java Tue Dec 13 21:18:25 2011 -0800 @@ -29,9 +29,7 @@ import com.sun.hotspot.igv.graph.Diagram; import com.sun.hotspot.igv.graph.Figure; import com.sun.hotspot.igv.graph.InputSlot; -import java.awt.Color; import java.util.HashSet; -import java.util.List; import java.util.Set; public class GraalCFGFilter extends AbstractFilter {
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java Tue Dec 13 21:17:46 2011 -0800 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java Tue Dec 13 21:18:25 2011 -0800 @@ -54,7 +54,12 @@ List<Figure> figures = d.getFigures(); for (Figure f : figures) { Properties p = f.getProperties(); - int predCount = Integer.parseInt(p.get("predecessorCount")); + int predCount; + if (p.get("predecessorCount") != null) { + predCount = Integer.parseInt(p.get("predecessorCount")); + } else { + predCount = 0; + } for (InputSlot is : f.getInputSlots()) { Color color; if (is.getPosition() < predCount) { @@ -65,7 +70,7 @@ is.setColor(color); for (Connection c : is.getConnections()) { - if (!c.getLabel().endsWith("#NDF")) { + if (c.getLabel() == null || !c.getLabel().endsWith("#NDF")) { c.setColor(color); } else if ("EndNode".equals(c.getOutputSlot().getFigure().getProperties().get("class")) || "EndNode".equals(c.getOutputSlot().getProperties().get("class"))) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/cfg.filter Tue Dec 13 21:18:25 2011 -0800 @@ -0,0 +1,2 @@ +var f = new com.sun.hotspot.igv.graal.filters.GraalCFGFilter(); +f.apply(graph);
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml Tue Dec 13 21:17:46 2011 -0800 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml Tue Dec 13 21:18:25 2011 -0800 @@ -33,5 +33,9 @@ <file name="Graal Call Analysis" url="filters/callgraph.filter"> <attr name="enabled" boolvalue="false"/> </file> + + <file name="Graal CFG-only" url="filters/cfg.filter"> + <attr name="enabled" boolvalue="false"/> + </file> </folder> </filesystem>