Mercurial > hg > truffle
changeset 5572:8f9c9d372e31
small renaming and doc fixes
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java Tue Jun 12 15:01:48 2012 +0200 @@ -24,7 +24,7 @@ /** * Represents a constant (boxed) value, such as an integer, floating point number, or object reference, - * within the compiler and across the compiler/runtime interface. Exports a set of {@code CiConstant} + * within the compiler and across the compiler/runtime interface. Exports a set of {@code Constant} * instances that represent frequently used constant values, such as {@link #ZERO}. */ public final class Constant extends Value { @@ -436,7 +436,7 @@ case Object: return forObject(value); default: - throw new RuntimeException("cannot create CiConstant for boxed " + kind + " value"); + throw new RuntimeException("cannot create Constant for boxed " + kind + " value"); } } }
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantPool.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantPool.java Tue Jun 12 15:01:48 2012 +0200 @@ -87,7 +87,7 @@ /** * Looks up a constant at the specified index. * @param cpi the constant pool index - * @return the {@code CiConstant} instance representing the constant + * @return the {@code Constant} or {@code JavaType} instance representing the constant pool entry */ Object lookupConstant(int cpi); }
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java Tue Jun 12 15:01:48 2012 +0200 @@ -56,7 +56,7 @@ ResolvedJavaMethod getResolvedJavaMethod(Method reflectionMethod); /** - * Gets the length of the array that is wrapped in a CiConstant object. + * Gets the length of the array that is wrapped in a Constant object. */ int getArrayLength(Constant array); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/SnippetIntrinsificationPhase.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/SnippetIntrinsificationPhase.java Tue Jun 12 15:01:48 2012 +0200 @@ -90,7 +90,7 @@ if (constant != null) { // Replace the invoke with the result of the call - ConstantNode node = ConstantNode.forCiConstant(constant, runtime, invoke.node().graph()); + ConstantNode node = ConstantNode.forConstant(constant, runtime, invoke.node().graph()); invoke.intrinsify(node); // Clean up checkcast instructions inserted by javac if the return type is generic.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Tue Jun 12 15:01:48 2012 +0200 @@ -308,7 +308,7 @@ if (arrayType != null && array.objectStamp().isExactType()) { ResolvedJavaType elementType = arrayType.componentType(); if (elementType.superType() != null) { - ConstantNode type = ConstantNode.forCiConstant(elementType.getEncoding(Representation.ObjectHub), this, graph); + ConstantNode type = ConstantNode.forConstant(elementType.getEncoding(Representation.ObjectHub), this, graph); checkcast = graph.add(new CheckCastNode(type, elementType, value)); graph.addBeforeFixed(storeIndexed, checkcast); value = checkcast;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Tue Jun 12 15:01:48 2012 +0200 @@ -284,7 +284,7 @@ // this is a load of class constant which might be unresolved JavaType riType = (JavaType) con; if (riType instanceof ResolvedJavaType) { - frameState.push(Kind.Object, append(ConstantNode.forCiConstant(((ResolvedJavaType) riType).getEncoding(Representation.JavaClass), runtime, currentGraph))); + frameState.push(Kind.Object, append(ConstantNode.forConstant(((ResolvedJavaType) riType).getEncoding(Representation.JavaClass), runtime, currentGraph))); } else { append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId))); frameState.push(Kind.Object, append(ConstantNode.forObject(null, runtime, currentGraph))); @@ -1097,7 +1097,7 @@ } private ConstantNode appendConstant(Constant constant) { - return ConstantNode.forCiConstant(constant, runtime, currentGraph); + return ConstantNode.forConstant(constant, runtime, currentGraph); } private ValueNode append(FixedNode fixed) { @@ -1274,7 +1274,7 @@ private ValueNode synchronizedObject(FrameStateBuilder state, ResolvedJavaMethod target) { if (isStatic(target.accessFlags())) { - return append(ConstantNode.forCiConstant(target.holder().getEncoding(Representation.JavaClass), runtime, currentGraph)); + return append(ConstantNode.forConstant(target.holder().getEncoding(Representation.JavaClass), runtime, currentGraph)); } else { return state.loadLocal(0); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Tue Jun 12 15:01:48 2012 +0200 @@ -106,22 +106,22 @@ */ public enum OperandFlag { /** - * The value can be a {@link CiRegisterValue}. + * The value can be a {@link RegisterValue}. */ Register, /** - * The value can be a {@link CiStackSlot}. + * The value can be a {@link StackSlot}. */ Stack, /** - * The value can be a {@link CiAddress}. + * The value can be a {@link Address}. */ Address, /** - * The value can be a {@link CiConstant}. + * The value can be a {@link Constant}. */ Constant,
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Tue Jun 12 15:01:48 2012 +0200 @@ -65,7 +65,7 @@ return usages().filter(NodePredicates.isNotA(FrameState.class)).isEmpty(); } - public static ConstantNode forCiConstant(Constant constant, CodeCacheProvider runtime, Graph graph) { + public static ConstantNode forConstant(Constant constant, CodeCacheProvider runtime, Graph graph) { if (constant.kind == Kind.Object) { return graph.unique(new ConstantNode(constant, runtime)); } else {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Tue Jun 12 15:01:48 2012 +0200 @@ -68,7 +68,7 @@ Kind kind = location().kind(); Constant constant = kind.readUnsafeConstant(value, displacement); if (constant != null) { - return ConstantNode.forCiConstant(constant, runtime, graph()); + return ConstantNode.forConstant(constant, runtime, graph()); } } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadHubNode.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadHubNode.java Tue Jun 12 15:01:48 2012 +0200 @@ -67,7 +67,7 @@ } if (exactType != null) { - return ConstantNode.forCiConstant(exactType.getEncoding(Representation.ObjectHub), runtime, graph()); + return ConstantNode.forConstant(exactType.getEncoding(Representation.ObjectHub), runtime, graph()); } } return this;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Tue Jun 12 15:01:48 2012 +0200 @@ -51,7 +51,7 @@ Kind kind = location().kind(); Constant constant = kind.readUnsafeConstant(value, displacement); if (constant != null) { - return ConstantNode.forCiConstant(constant, runtime, graph()); + return ConstantNode.forConstant(constant, runtime, graph()); } } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Tue Jun 12 15:01:48 2012 +0200 @@ -69,7 +69,7 @@ if (node instanceof IntegerDivNode || node instanceof IntegerRemNode) { ArithmeticNode arithmeticNode = (ArithmeticNode) node; if (arithmeticNode.y().isConstant()) { - Constant constant = arithmeticNode.y().asConstant(); + Constant constant = arithmeticNode.y().asConstant(); assert constant.kind == arithmeticNode.kind() : constant.kind + " != " + arithmeticNode.kind(); if (constant.asLong() != 0) { continue;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Tue Jun 12 15:01:48 2012 +0200 @@ -64,7 +64,7 @@ constant = field().constantValue(object().asConstant()); } if (constant != null) { - return ConstantNode.forCiConstant(constant, runtime, graph()); + return ConstantNode.forConstant(constant, runtime, graph()); } } return this;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Tue Jun 12 15:01:48 2012 +0200 @@ -70,7 +70,7 @@ Object array = arrayConst.asObject(); int length = Array.getLength(array); if (index >= 0 && index < length) { - return ConstantNode.forCiConstant(elementKind().readUnsafeConstant(array, + return ConstantNode.forConstant(elementKind().readUnsafeConstant(array, elementKind().arrayBaseOffset() + index * elementKind().arrayIndexScale()), runtime, graph()); } }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetTemplate.java Mon Jun 11 17:06:06 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetTemplate.java Tue Jun 12 15:01:48 2012 +0200 @@ -197,7 +197,7 @@ assert arg != null : method + ": requires a constant named " + name; Kind kind = signature.argumentKindAt(i); assert checkConstantArgument(method, signature, i, name, arg, kind); - replacements.put(snippetGraph.getLocal(i), ConstantNode.forCiConstant(Constant.forBoxed(kind, arg), runtime, snippetCopy)); + replacements.put(snippetGraph.getLocal(i), ConstantNode.forConstant(Constant.forBoxed(kind, arg), runtime, snippetCopy)); } else { Parameter p = CodeUtil.getParameterAnnotation(Parameter.class, i, method); assert p != null : method + ": parameter " + i + " must be annotated with either @Constant or @Parameter"; @@ -386,7 +386,7 @@ } else { Kind kind = ((LocalNode) parameter).kind(); Constant constant = Constant.forBoxed(kind, argument); - replacements.put((LocalNode) parameter, ConstantNode.forCiConstant(constant, runtime, replaceeGraph)); + replacements.put((LocalNode) parameter, ConstantNode.forConstant(constant, runtime, replaceeGraph)); } } else { assert parameter instanceof LocalNode[]; @@ -399,7 +399,7 @@ LocalNode local = locals[j]; assert local != null; Constant constant = Constant.forBoxed(local.kind(), Array.get(array, j)); - ConstantNode element = ConstantNode.forCiConstant(constant, runtime, replaceeGraph); + ConstantNode element = ConstantNode.forConstant(constant, runtime, replaceeGraph); replacements.put(local, element); } }