# HG changeset patch # User Lukas Stadler # Date 1335518177 -7200 # Node ID be1a8ff480db4820d2bd6c23d8329264cb453abb # Parent f8fc624c07a7ccb9311ad7ec53459cc14374644e Visualizer: display long properties correctly, "!InstanceOf" for negated InstanceOfNodes diff -r f8fc624c07a7 -r be1a8ff480db graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java --- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Fri Apr 27 11:15:16 2012 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Fri Apr 27 11:16:17 2012 +0200 @@ -557,10 +557,12 @@ value = unsafe.getInt(node, dataOffsets[i]); } else if (type == Boolean.TYPE) { value = unsafe.getBoolean(node, dataOffsets[i]); + } else if (type == Long.TYPE) { + value = unsafe.getLong(node, dataOffsets[i]); } else if (type == Double.TYPE) { - value = String.format(Locale.ENGLISH, "%7.5f", unsafe.getDouble(node, dataOffsets[i])); + value = unsafe.getDouble(node, dataOffsets[i]); } else { - assert false; + assert false : "unhandled property type: " + type; } } else { value = unsafe.getObject(node, dataOffsets[i]); diff -r f8fc624c07a7 -r be1a8ff480db graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Fri Apr 27 11:15:16 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Fri Apr 27 11:16:17 2012 +0200 @@ -24,6 +24,7 @@ import com.oracle.max.cri.ci.*; import com.oracle.max.cri.ri.*; +import com.oracle.graal.graph.Node.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; @@ -109,6 +110,15 @@ } @Override + public String toString(Verbosity verbosity) { + if (verbosity == Verbosity.Name && negated) { + return "!" + super.toString(Verbosity.Name); + } else { + return super.toString(verbosity); + } + } + + @Override public Result canonical(TypeFeedbackTool tool) { ObjectTypeQuery query = tool.queryObject(object()); if (query.constantBound(Condition.EQ, CiConstant.NULL_OBJECT)) {