Mercurial > hg > graal-compiler
changeset 11868:44257a9160f1
Merge.
author | Chris Seaton <chris.seaton@oracle.com> |
---|---|
date | Wed, 02 Oct 2013 14:46:30 +0100 |
parents | 952ecf32788a (current diff) ee88780346a4 (diff) |
children | 18824519c172 |
files | |
diffstat | 5 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Wed Oct 02 14:19:28 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Wed Oct 02 14:46:30 2013 +0100 @@ -37,10 +37,10 @@ public Constant evalConst(Constant... inputs) { assert inputs.length == 2; if (kind() == Kind.Float) { - return Constant.forFloat(x().asConstant().asFloat() + y().asConstant().asFloat()); + return Constant.forFloat(inputs[0].asFloat() + inputs[1].asFloat()); } else { assert kind() == Kind.Double; - return Constant.forDouble(x().asConstant().asDouble() + y().asConstant().asDouble()); + return Constant.forDouble(inputs[0].asDouble() + inputs[1].asDouble()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Wed Oct 02 14:19:28 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Wed Oct 02 14:46:30 2013 +0100 @@ -37,10 +37,10 @@ public Constant evalConst(Constant... inputs) { assert inputs.length == 2; if (kind() == Kind.Float) { - return Constant.forFloat(x().asConstant().asFloat() / y().asConstant().asFloat()); + return Constant.forFloat(inputs[0].asFloat() / inputs[1].asFloat()); } else { assert kind() == Kind.Double; - return Constant.forDouble(x().asConstant().asDouble() / y().asConstant().asDouble()); + return Constant.forDouble(inputs[0].asDouble() / inputs[1].asDouble()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Wed Oct 02 14:19:28 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Wed Oct 02 14:46:30 2013 +0100 @@ -37,10 +37,10 @@ public Constant evalConst(Constant... inputs) { assert inputs.length == 2; if (kind() == Kind.Float) { - return Constant.forFloat(x().asConstant().asFloat() * y().asConstant().asFloat()); + return Constant.forFloat(inputs[0].asFloat() * inputs[1].asFloat()); } else { assert kind() == Kind.Double; - return Constant.forDouble(x().asConstant().asDouble() * y().asConstant().asDouble()); + return Constant.forDouble(inputs[0].asDouble() * inputs[1].asDouble()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Wed Oct 02 14:19:28 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Wed Oct 02 14:46:30 2013 +0100 @@ -37,10 +37,10 @@ public Constant evalConst(Constant... inputs) { assert inputs.length == 2; if (kind() == Kind.Float) { - return Constant.forFloat(x().asConstant().asFloat() % y().asConstant().asFloat()); + return Constant.forFloat(inputs[0].asFloat() % inputs[1].asFloat()); } else { assert kind() == Kind.Double; - return Constant.forDouble(x().asConstant().asDouble() % y().asConstant().asDouble()); + return Constant.forDouble(inputs[0].asDouble() % inputs[1].asDouble()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Wed Oct 02 14:19:28 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Wed Oct 02 14:46:30 2013 +0100 @@ -37,10 +37,10 @@ public Constant evalConst(Constant... inputs) { assert inputs.length == 2; if (kind() == Kind.Float) { - return Constant.forFloat(x().asConstant().asFloat() - y().asConstant().asFloat()); + return Constant.forFloat(inputs[0].asFloat() - inputs[1].asFloat()); } else { assert kind() == Kind.Double; - return Constant.forDouble(x().asConstant().asDouble() - y().asConstant().asDouble()); + return Constant.forDouble(inputs[0].asDouble() - inputs[1].asDouble()); } }