Mercurial > hg > truffle
changeset 11271:153a347e54c4
Remove unused class from node hierarchy.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Fri, 09 Aug 2013 11:36:13 +0200 |
parents | 0c908dba44fb |
children | 1e07d9303420 |
files | graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java |
diffstat | 4 files changed, 16 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Aug 09 11:15:37 2013 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Aug 09 11:36:13 2013 +0200 @@ -546,7 +546,7 @@ ValueNode y = frameState.pop(result); ValueNode x = frameState.pop(result); boolean isStrictFP = isStrict(method.getModifiers()); - ArithmeticNode v; + BinaryNode v; switch (opcode) { case IADD: case LADD:
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java Fri Aug 09 11:15:37 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.calc; - -import com.oracle.graal.api.meta.*; -import com.oracle.graal.nodes.*; - -/** - * The {@code ArithmeticOp} class represents arithmetic operations such as addition, subtraction, - * etc. - */ -public abstract class ArithmeticNode extends BinaryNode { - - private final boolean isStrictFP; - - /** - * Creates a new arithmetic operation. - * - * @param kind the result kind of the operation - * @param x the first input instruction - * @param y the second input instruction - * @param isStrictFP indicates this operation has strict rounding semantics - */ - public ArithmeticNode(Kind kind, ValueNode x, ValueNode y, boolean isStrictFP) { - super(kind, x, y); - this.isStrictFP = isStrictFP; - } - - /** - * Checks whether this instruction has strict fp semantics. - * - * @return {@code true} if this instruction has strict fp semantics - */ - public boolean isStrictFP() { - return isStrictFP; - } -}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java Fri Aug 09 11:15:37 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java Fri Aug 09 11:36:13 2013 +0200 @@ -25,10 +25,21 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; -public abstract class FloatArithmeticNode extends ArithmeticNode { +public abstract class FloatArithmeticNode extends BinaryNode { + + private final boolean isStrictFP; public FloatArithmeticNode(Kind kind, ValueNode x, ValueNode y, boolean isStrictFP) { - super(kind, x, y, isStrictFP); + super(kind, x, y); + this.isStrictFP = isStrictFP; } + /** + * Checks whether this instruction has strict fp semantics. + * + * @return {@code true} if this instruction has strict fp semantics + */ + public boolean isStrictFP() { + return isStrictFP; + } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java Fri Aug 09 11:15:37 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java Fri Aug 09 11:36:13 2013 +0200 @@ -26,10 +26,10 @@ import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; -public abstract class IntegerArithmeticNode extends ArithmeticNode { +public abstract class IntegerArithmeticNode extends BinaryNode { public IntegerArithmeticNode(Kind kind, ValueNode x, ValueNode y) { - super(kind, x, y, false); + super(kind, x, y); assert kind == Kind.Int || kind == Kind.Long; }