Mercurial > hg > graal-jvmci-8
changeset 22212:d2ca00003481
Rename NodeMappableLIRBuilder to NodeValueMap.
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AbsNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AbsNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -55,7 +55,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitMathAbs(builder.operand(getValue()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitMathAbs(nodeValueMap.operand(getValue()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AddNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AddNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -109,15 +109,15 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - Value op1 = builder.operand(getX()); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + Value op1 = nodeValueMap.operand(getX()); assert op1 != null : getX() + ", this=" + this; - Value op2 = builder.operand(getY()); - if (!getY().isConstant() && !BinaryArithmeticNode.livesLonger(this, getY(), builder)) { + Value op2 = nodeValueMap.operand(getY()); + if (!getY().isConstant() && !BinaryArithmeticNode.livesLonger(this, getY(), nodeValueMap)) { Value tmp = op1; op1 = op2; op2 = tmp; } - builder.setResult(this, gen.emitAdd(op1, op2, false)); + nodeValueMap.setResult(this, gen.emitAdd(op1, op2, false)); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -101,7 +101,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitAnd(builder.operand(getX()), builder.operand(getY()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitAnd(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryArithmeticNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryArithmeticNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -245,9 +245,9 @@ } } - protected static boolean livesLonger(ValueNode after, ValueNode value, NodeMappableLIRBuilder builder) { + protected static boolean livesLonger(ValueNode after, ValueNode value, NodeValueMap nodeValueMap) { for (Node usage : value.usages()) { - if (usage != after && usage instanceof ValueNode && builder.hasOperand(usage)) { + if (usage != after && usage instanceof ValueNode && nodeValueMap.hasOperand(usage)) { return true; } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/DivNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/DivNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -91,7 +91,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitDiv(builder.operand(getX()), builder.operand(getY()), null)); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitDiv(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()), null)); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -113,7 +113,7 @@ tool.getLowerer().lower(this, tool); } - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitFloatConvert(getFloatConvert(), builder.operand(getValue()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitFloatConvert(getFloatConvert(), nodeValueMap.operand(getValue()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -85,7 +85,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitShl(builder.operand(getX()), builder.operand(getY()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitShl(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/MulNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/MulNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -93,14 +93,14 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - Value op1 = builder.operand(getX()); - Value op2 = builder.operand(getY()); - if (!getY().isConstant() && !BinaryArithmeticNode.livesLonger(this, getY(), builder)) { + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + Value op1 = nodeValueMap.operand(getX()); + Value op2 = nodeValueMap.operand(getY()); + if (!getY().isConstant() && !BinaryArithmeticNode.livesLonger(this, getY(), nodeValueMap)) { Value tmp = op1; op1 = op2; op2 = tmp; } - builder.setResult(this, gen.emitMul(op1, op2, false)); + nodeValueMap.setResult(this, gen.emitMul(op1, op2, false)); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -108,7 +108,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitNarrow(builder.operand(getValue()), getResultBits())); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitNarrow(nodeValueMap.operand(getValue()), getResultBits())); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -60,7 +60,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitNegate(builder.operand(getValue()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitNegate(nodeValueMap.operand(getValue()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -56,7 +56,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitNot(builder.operand(getValue()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitNot(nodeValueMap.operand(getValue()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -89,7 +89,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitOr(builder.operand(getX()), builder.operand(getY()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitOr(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -83,9 +83,9 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { LIRKind kind = gen.getLIRKind(stamp()); - builder.setResult(this, gen.emitReinterpret(kind, builder.operand(getValue()))); + nodeValueMap.setResult(this, gen.emitReinterpret(kind, nodeValueMap.operand(getValue()))); } public static ValueNode reinterpret(Kind toKind, ValueNode value) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RemNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RemNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -45,7 +45,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitRem(builder.operand(getX()), builder.operand(getY()), null)); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitRem(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()), null)); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -97,8 +97,8 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitShr(builder.operand(getX()), builder.operand(getY()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitShr(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()))); } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -103,7 +103,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitSignExtend(builder.operand(getValue()), getInputBits(), getResultBits())); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitSignExtend(nodeValueMap.operand(getValue()), getInputBits(), getResultBits())); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SqrtNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SqrtNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -43,7 +43,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitMathSqrt(builder.operand(getValue()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitMathSqrt(nodeValueMap.operand(getValue()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SubNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SubNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -151,7 +151,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitSub(builder.operand(getX()), builder.operand(getY()), false)); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitSub(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()), false)); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -85,8 +85,8 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitUShr(builder.operand(getX()), builder.operand(getY()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitUShr(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()))); } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -90,7 +90,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitXor(builder.operand(getX()), builder.operand(getY()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitXor(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -116,7 +116,7 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitZeroExtend(builder.operand(getValue()), getInputBits(), getResultBits())); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitZeroExtend(nodeValueMap.operand(getValue()), getInputBits(), getResultBits())); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArithmeticLIRLowerable.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArithmeticLIRLowerable.java Wed Jul 01 17:21:45 2015 +0200 @@ -28,5 +28,5 @@ public interface ArithmeticLIRLowerable extends ArithmeticOperation { - void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen); + void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Wed Jul 01 17:21:45 2015 +0200 @@ -37,7 +37,7 @@ import com.oracle.graal.nodes.cfg.*; import com.oracle.graal.nodes.extended.*; -public interface NodeLIRBuilderTool extends NodeMappableLIRBuilder { +public interface NodeLIRBuilderTool extends NodeValueMap { // TODO (je) remove and move into the Node LIRFrameState state(DeoptimizingNode deopt);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeMappableLIRBuilder.java Thu Jul 09 11:29:41 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.oracle.graal.nodes.spi; - -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; - -public interface NodeMappableLIRBuilder { - - Value operand(Node object); - - boolean hasOperand(Node object); - - Value setResult(ValueNode x, Value operand); -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeValueMap.java Wed Jul 01 17:21:45 2015 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.oracle.graal.nodes.spi; + +import jdk.internal.jvmci.meta.*; + +import com.oracle.graal.graph.*; +import com.oracle.graal.nodes.*; + +public interface NodeValueMap { + + Value operand(Node object); + + boolean hasOperand(Node object); + + Value setResult(ValueNode x, Value operand); +}
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -54,7 +54,7 @@ return this; } - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - builder.setResult(this, gen.emitFloatConvert(op, builder.operand(getValue()))); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + nodeValueMap.setResult(this, gen.emitFloatConvert(op, nodeValueMap.operand(getValue()))); } }
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathIntrinsicNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathIntrinsicNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -76,9 +76,9 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator lirGen) { + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator lirGen) { AMD64ArithmeticLIRGenerator gen = (AMD64ArithmeticLIRGenerator) lirGen; - Value input = builder.operand(getValue()); + Value input = nodeValueMap.operand(getValue()); Value result; switch (operation()) { case LOG: @@ -99,7 +99,7 @@ default: throw JVMCIError.shouldNotReachHere(); } - builder.setResult(this, result); + nodeValueMap.setResult(this, result); } @Override
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulHighNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulHighNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -83,10 +83,10 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - Value a = builder.operand(getX()); - Value b = builder.operand(getY()); - builder.setResult(this, gen.emitMulHigh(a, b)); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + Value a = nodeValueMap.operand(getX()); + Value b = nodeValueMap.operand(getY()); + nodeValueMap.setResult(this, gen.emitMulHigh(a, b)); } public static int multiplyHigh(int x, int y) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java Thu Jul 09 11:29:41 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java Wed Jul 01 17:21:45 2015 +0200 @@ -88,10 +88,10 @@ } @Override - public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) { - Value a = builder.operand(getX()); - Value b = builder.operand(getY()); - builder.setResult(this, gen.emitUMulHigh(a, b)); + public void generate(NodeValueMap nodeValueMap, ArithmeticLIRGenerator gen) { + Value a = nodeValueMap.operand(getX()); + Value b = nodeValueMap.operand(getY()); + nodeValueMap.setResult(this, gen.emitUMulHigh(a, b)); } public static int multiplyHighUnsigned(int x, int y) {