Mercurial > hg > truffle

diff graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/calc/CompareNode.java @ 4309:4a609a685fa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changes to Node structures: * add more uses of higher-level graph manipulation methods * CanonicalierPhase cleanup * introduce FloatingReadNode, make ReadNode an ordinary fixed nodeToBlock * let Canonicalizable.canonical return ValueNode (instead of Node)
author Lukas Stadler <lukas.stadler@jku.at>
date Tue, 17 Jan 2012 19:45:39 +0100
parents aaac4894175c
children e065aa86d077
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/calc/CompareNode.java	Tue Jan 17 15:28:41 2012 +0100
+++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/calc/CompareNode.java	Tue Jan 17 19:45:39 2012 +0100
@@ -24,7 +24,6 @@
 
 import com.oracle.max.cri.ci.*;
 import com.oracle.max.cri.ri.*;
-import com.oracle.max.graal.graph.*;
 import com.oracle.max.graal.nodes.*;
 import com.oracle.max.graal.nodes.spi.*;
 import com.oracle.max.graal.nodes.type.*;
@@ -116,7 +115,7 @@
         }
     }
 
-    private Node optimizeMaterialize(CiConstant constant, MaterializeNode materializeNode, RiRuntime runtime) {
+    private ValueNode optimizeMaterialize(CiConstant constant, MaterializeNode materializeNode, RiRuntime runtime) {
         CiConstant trueConstant = materializeNode.trueValue().asConstant();
         CiConstant falseConstant = materializeNode.falseValue().asConstant();
 
@@ -144,7 +143,7 @@
         return this;
     }
 
-    private Node optimizeNormalizeCmp(CiConstant constant, NormalizeCompareNode normalizeNode) {
+    private ValueNode optimizeNormalizeCmp(CiConstant constant, NormalizeCompareNode normalizeNode) {
         if (constant.kind == CiKind.Int && constant.asInt() == 0) {
             Condition cond = condition();
             if (normalizeNode.x().kind().isFloatOrDouble()) {
@@ -167,7 +166,7 @@
     }
 
     @Override
-    public Node canonical(CanonicalizerTool tool) {
+    public ValueNode canonical(CanonicalizerTool tool) {
         if (x().isConstant() && !y().isConstant()) { // move constants to the left (y)
             return graph().unique(new CompareNode(y(), condition.mirror(), unorderedIsTrue(), x()));
         } else if (x().isConstant() && y().isConstant()) {