# HG changeset patch # User Doug Simon # Date 1341517636 -7200 # Node ID 2c088af17e590ffb9b7ecc29dd37325a3b47f5c8 # Parent a1db0ea58b53365aab7a60674c6e99a9e4ab4680 Removed left over Ri* prefixed identifiers diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java Thu Jul 05 21:47:16 2012 +0200 @@ -93,14 +93,16 @@ int encodeDeoptActionAndReason(DeoptimizationAction action, DeoptimizationReason reason); /** - * Converts a RiDeoptReason into an integer value. - * @return An integer value representing the given RiDeoptReason. + * Converts a {@link DeoptimizationReason} into an integer value. + * + * @return an integer value representing the given {@link DeoptimizationReason} */ int convertDeoptReason(DeoptimizationReason reason); /** - * Converts a RiDeoptAction into an integer value. - * @return An integer value representing the given RiDeoptAction. + * Converts a {@link DeoptimizationAction} into an integer value. + * + * @return an integer value representing the given {@link DeoptimizationAction} */ int convertDeoptAction(DeoptimizationAction action); } diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Jul 05 21:47:16 2012 +0200 @@ -59,14 +59,14 @@ /** * The XIR generator that lowers Java operations to machine operations. */ - public final RiXirGenerator xir; + public final XirGenerator xir; /** * The backend that this compiler has been configured for. */ public final Backend backend; - public GraalCompiler(GraalCodeCacheProvider runtime, TargetDescription target, Backend backend, RiXirGenerator xirGen) { + public GraalCompiler(GraalCodeCacheProvider runtime, TargetDescription target, Backend backend, XirGenerator xirGen) { this.runtime = runtime; this.target = target; this.xir = xirGen; diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Thu Jul 05 21:47:16 2012 +0200 @@ -78,7 +78,7 @@ protected final LIR lir; protected final XirSupport xirSupport; - protected final RiXirGenerator xir; + protected final XirGenerator xir; private final DebugInfoBuilder debugInfoBuilder; private Block currentBlock; @@ -142,7 +142,7 @@ private LockScope curLocks; - public LIRGenerator(Graph graph, CodeCacheProvider runtime, TargetDescription target, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, RiXirGenerator xir, Assumptions assumptions) { + public LIRGenerator(Graph graph, CodeCacheProvider runtime, TargetDescription target, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, XirGenerator xir, Assumptions assumptions) { this.graph = graph; this.runtime = runtime; this.target = target; diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CheckCastEliminationPhase.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CheckCastEliminationPhase.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CheckCastEliminationPhase.java Thu Jul 05 21:47:16 2012 +0200 @@ -168,14 +168,14 @@ for (PhiNode phi : merge.phis()) { if (phi.type() == PhiType.Value && phi.kind() == Kind.Object) { ValueNode firstValue = phi.valueAt(0); - RiResolvedType type = getNodeType(firstValue); + ResolvedJavaType type = getNodeType(firstValue); boolean notNull = knownNotNull.contains(firstValue); boolean nul = knownNull.contains(firstValue); for (int i = 0; i < withStates.size(); i++) { State otherState = withStates.get(i); ValueNode value = phi.valueAt(i + 1); - RiResolvedType otherType = otherState.getNodeType(value); + ResolvedJavaType otherType = otherState.getNodeType(value); type = widen(type, otherType); notNull &= otherState.knownNotNull.contains(value); nul &= otherState.knownNull.contains(value); diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Jul 05 21:47:16 2012 +0200 @@ -72,7 +72,7 @@ return new FrameMap(runtime, target, registerConfig); } - public abstract LIRGenerator newLIRGenerator(Graph graph, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, RiXirGenerator xir, Assumptions assumptions); + public abstract LIRGenerator newLIRGenerator(Graph graph, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, XirGenerator xir, Assumptions assumptions); public abstract TargetMethodAssembler newAssembler(FrameMap frameMap, LIR lir); diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java Thu Jul 05 21:47:16 2012 +0200 @@ -93,7 +93,7 @@ } } - public AMD64LIRGenerator(Graph graph, CodeCacheProvider runtime, TargetDescription target, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, RiXirGenerator xir, Assumptions assumptions) { + public AMD64LIRGenerator(Graph graph, CodeCacheProvider runtime, TargetDescription target, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, XirGenerator xir, Assumptions assumptions) { super(graph, runtime, target, frameMap, method, lir, xir, assumptions); lir.spillMoveFactory = new AMD64SpillMoveFactory(); } diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Jul 05 21:47:16 2012 +0200 @@ -116,9 +116,9 @@ // these options are important - graal will not generate correct code without them GraalOptions.StackShadowPages = config.stackShadowPages; - RiXirGenerator generator = new HotSpotXirGenerator(config, getTarget(), getRuntime().getGlobalStubRegisterConfig(), this); + XirGenerator generator = new HotSpotXirGenerator(config, getTarget(), getRuntime().getGlobalStubRegisterConfig(), this); if (Logger.ENABLED) { - generator = LoggingProxy.getProxy(RiXirGenerator.class, generator); + generator = LoggingProxy.getProxy(XirGenerator.class, generator); } Backend backend = Backend.create(runtime, target); diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Jul 05 21:47:16 2012 +0200 @@ -411,7 +411,7 @@ public JavaField createJavaField(JavaType holder, String name, JavaType type, int offset, int flags) { if (offset != -1) { HotSpotResolvedJavaType resolved = (HotSpotResolvedJavaType) holder; - return resolved.createRiField(name, type, offset, flags); + return resolved.createField(name, type, offset, flags); } return new UnresolvedField(holder, name, type); } diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCompiledMethod.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCompiledMethod.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCompiledMethod.java Thu Jul 05 21:47:16 2012 +0200 @@ -28,7 +28,7 @@ import com.oracle.graal.hotspot.*; /** - * Implementation of RiCompiledMethod for HotSpot. + * Implementation of {@link InstalledCode} for HotSpot. * Stores a reference to the nmethod which contains the compiled code. * The nmethod also stores a weak reference to the HotSpotCompiledMethod * instance which is necessary to keep the nmethod from being unloaded. diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Thu Jul 05 21:47:16 2012 +0200 @@ -26,7 +26,7 @@ import com.oracle.graal.hotspot.*; /** - * Implementation of RiConstantPool for HotSpot. + * Implementation of {@link ConstantPool} for HotSpot. */ public class HotSpotConstantPool extends CompilerObject implements ConstantPool { diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java Thu Jul 05 21:47:16 2012 +0200 @@ -36,16 +36,16 @@ * This class implements the graph caching system for the HotSpot platform. * * This implementation does not use a map to store the actual cached graphs. The problem is that such maps keep the - * graph, and therefore the RiResolvedMethod referenced from the graph, alive. For some applications and benchmarks this + * graph, and therefore the {@link ResolvedJavaMethod} referenced from the graph, alive. For some applications and benchmarks this * is a problem, e.g., the DaCapoScala "scalatest" benchmark will quickly run out of perm gen because of this. * - * This cannot be solved with a WeakHashMap, since the values within the map will keep the keys + * This cannot be solved with a {@code WeakHashMap}, since the values within the map will keep the keys * alive. In order for this to work we would require a weak map in which the "strongness" of the value references * depends upon the reachability of the keys. * - * Therefore the graph cache is implemented in such a way that it stores its cache entries within the RiResolvedMethod. + * Therefore the graph cache is implemented in such a way that it stores its cache entries within the {@link ResolvedJavaMethod}. * It uses the {@link ResolvedJavaMethod#compilerStorage()} map with the HotSpotGraphCache instance as key. - * The cached graph will be kept alive as long as the RiResolvedMethod is alive, but does not prevent the method, and + * The cached graph will be kept alive as long as the {@link ResolvedJavaMethod} is alive, but does not prevent the method, and * therefore the class, from being unloaded. * * The {@link #cachedGraphIds} map is used to find the graphs that should be removed because of deoptimization, and to diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotJavaType.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotJavaType.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotJavaType.java Thu Jul 05 21:47:16 2012 +0200 @@ -26,7 +26,7 @@ import com.oracle.graal.hotspot.*; /** - * Common interface for all HotSpot RiType-implementations. + * Common interface for all HotSpot {@link JavaType} implementations. */ public abstract class HotSpotJavaType extends CompilerObject implements JavaType { private static final long serialVersionUID = -4252886265301910771L; diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Thu Jul 05 21:47:16 2012 +0200 @@ -358,7 +358,7 @@ } totalCount += getTypesNotRecordedExecutionCount(data, position); - return createRiTypeProfile(types, counts, totalCount, entries); + return createTypeProfile(types, counts, totalCount, entries); } protected long getTypesNotRecordedExecutionCount(HotSpotMethodData data, int position) { @@ -367,7 +367,7 @@ return getCounterValue(data, position); } - private static JavaTypeProfile createRiTypeProfile(ResolvedJavaType[] types, long[] counts, long totalCount, int entries) { + private static JavaTypeProfile createTypeProfile(ResolvedJavaType[] types, long[] counts, long totalCount, int entries) { if (entries <= 0 || totalCount < GraalOptions.MatureExecutionsTypeProfile) { return null; } diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodUnresolved.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodUnresolved.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodUnresolved.java Thu Jul 05 21:47:16 2012 +0200 @@ -25,7 +25,7 @@ import com.oracle.graal.api.meta.*; /** - * Implementation of RiMethod for unresolved HotSpot methods. + * Implementation of {@link JavaMethod} for unresolved HotSpot methods. */ public final class HotSpotMethodUnresolved extends HotSpotMethod { private static final long serialVersionUID = 5610263481791970079L; diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java Thu Jul 05 21:47:16 2012 +0200 @@ -34,7 +34,7 @@ import com.oracle.graal.hotspot.counters.*; /** - * Implementation of RiMethod for resolved HotSpot methods. + * Implementation of {@link JavaMethod} for resolved HotSpot methods. */ public final class HotSpotResolvedJavaMethod extends HotSpotMethod implements ResolvedJavaMethod { diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java Thu Jul 05 21:47:16 2012 +0200 @@ -31,7 +31,7 @@ import com.oracle.graal.hotspot.*; /** - * Implementation of RiType for resolved non-primitive HotSpot classes. + * Implementation of {@link JavaType} for resolved non-primitive HotSpot classes. */ public final class HotSpotResolvedJavaType extends HotSpotJavaType implements ResolvedJavaType { @@ -217,7 +217,7 @@ return instanceSize; } - public synchronized ResolvedJavaField createRiField(String fieldName, JavaType type, int offset, int flags) { + public synchronized ResolvedJavaField createField(String fieldName, JavaType type, int offset, int flags) { ResolvedJavaField result = null; long id = offset + ((long) flags << 32); diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java Thu Jul 05 21:47:16 2012 +0200 @@ -30,7 +30,7 @@ import com.oracle.graal.hotspot.*; /** - * Implementation of RiType for primitive HotSpot types. + * Implementation of {@link JavaType} for primitive HotSpot types. */ public final class HotSpotTypePrimitive extends HotSpotJavaType implements ResolvedJavaType { diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypeUnresolved.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypeUnresolved.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypeUnresolved.java Thu Jul 05 21:47:16 2012 +0200 @@ -27,7 +27,7 @@ import com.oracle.graal.hotspot.*; /** - * Implementation of RiType for unresolved HotSpot classes. + * Implementation of {@link JavaType} for unresolved HotSpot classes. */ public class HotSpotTypeUnresolved extends HotSpotJavaType { diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotXirGenerator.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotXirGenerator.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotXirGenerator.java Thu Jul 05 21:47:16 2012 +0200 @@ -45,7 +45,7 @@ import com.oracle.max.cri.xir.XirAssembler.XirOperand; import com.oracle.max.cri.xir.XirAssembler.XirParameter; -public class HotSpotXirGenerator implements RiXirGenerator { +public class HotSpotXirGenerator implements XirGenerator { // this needs to correspond to graal_CodeInstaller.hpp // @formatter:off diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64TailcallOp.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64TailcallOp.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64TailcallOp.java Thu Jul 05 21:47:16 2012 +0200 @@ -33,7 +33,7 @@ import com.oracle.max.asm.target.amd64.*; /** - * Performs a hard-coded tail call to the specified target, which normally should be an RiCompiledCode instance. + * Performs a hard-coded tail call to the specified target, which normally should be an {@link InstalledCode} instance. */ @Opcode("TAILCALL") public class AMD64TailcallOp extends AMD64LIRInstruction { diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java Thu Jul 05 21:47:16 2012 +0200 @@ -56,7 +56,7 @@ } @Override - public LIRGenerator newLIRGenerator(Graph graph, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, RiXirGenerator xir, Assumptions assumptions) { + public LIRGenerator newLIRGenerator(Graph graph, FrameMap frameMap, ResolvedJavaMethod method, LIR lir, XirGenerator xir, Assumptions assumptions) { return new AMD64LIRGenerator(graph, runtime, target, frameMap, method, lir, xir, assumptions) { @Override diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/Condition.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/Condition.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/Condition.java Thu Jul 05 21:47:16 2012 +0200 @@ -240,9 +240,10 @@ /** * Attempts to fold a comparison between two constants and return the result. + * * @param lt the constant on the left side of the comparison * @param rt the constant on the right side of the comparison - * @param runtime the RiRuntime (might be needed to compare runtime-specific types) + * @param runtime needed to compare runtime-specific types * @return {@link Boolean#TRUE} if the comparison is known to be true, * {@link Boolean#FALSE} if the comparison is known to be false */ @@ -253,9 +254,10 @@ /** * Attempts to fold a comparison between two constants and return the result. + * * @param lt the constant on the left side of the comparison * @param rt the constant on the right side of the comparison - * @param runtime the RiRuntime (might be needed to compare runtime-specific types) + * @param runtime needed to compare runtime-specific types * @param unorderedIsTrue true if an undecided float comparison should result in "true" * @return true if the comparison is known to be true, false if the comparison is known to be false */ diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackStore.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackStore.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackStore.java Thu Jul 05 21:47:16 2012 +0200 @@ -504,9 +504,9 @@ private HashMap valueBounds; - private Set exactTypes; + private Set exactTypes; - private Set declaredTypes; + private Set declaredTypes; private final TypeFeedbackChanged changed; private Node dependency; @@ -594,15 +594,15 @@ } @Override - public void declaredType(RiResolvedType type, boolean nonNull) { + public void declaredType(ResolvedJavaType type, boolean nonNull) { if (declaredTypes == null) { declaredTypes = new HashSet<>(); declaredTypes.add(type); updateDependency(); } else { if (type.isInterface()) { - for (Iterator iter = declaredTypes.iterator(); iter.hasNext();) { - RiResolvedType declaredType = iter.next(); + for (Iterator iter = declaredTypes.iterator(); iter.hasNext();) { + ResolvedJavaType declaredType = iter.next(); if (declaredType.isInterface()) { if (type.isSubtypeOf(declaredType)) { iter.remove(); @@ -616,8 +616,8 @@ updateDependency(); } } else { - for (Iterator iter = declaredTypes.iterator(); iter.hasNext();) { - RiResolvedType declaredType = iter.next(); + for (Iterator iter = declaredTypes.iterator(); iter.hasNext();) { + ResolvedJavaType declaredType = iter.next(); if (!declaredType.isInterface()) { if (type.isSubtypeOf(declaredType)) { iter.remove(); @@ -638,7 +638,7 @@ } @Override - public void exactType(RiResolvedType type) { + public void exactType(ResolvedJavaType type) { if (exactTypes == null) { exactTypes = new HashSet<>(); exactTypes.add(type); @@ -657,11 +657,11 @@ } @Override - public void notDeclaredType(RiResolvedType type, boolean nonNull) { + public void notDeclaredType(ResolvedJavaType type, boolean nonNull) { } @Override - public void notExactType(RiResolvedType type) { + public void notExactType(ResolvedJavaType type) { } @Override @@ -756,7 +756,7 @@ } if (declaredTypes != null) { str.append("declared ("); - for (RiResolvedType type: declaredTypes) { + for (ResolvedJavaType type: declaredTypes) { str.append(type).append(','); } str.setLength(str.length() - 1); @@ -764,7 +764,7 @@ } if (exactTypes != null) { str.append("exact ("); - for (RiResolvedType type: exactTypes) { + for (ResolvedJavaType type: exactTypes) { str.append(type).append(','); } str.setLength(str.length() - 1); diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinterDumpHandler.java --- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinterDumpHandler.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinterDumpHandler.java Thu Jul 05 21:47:16 2012 +0200 @@ -102,7 +102,7 @@ final Graph graph = (Graph) object; if (printer != null && printer.isValid()) { - // Get all current RiResolvedMethod instances in the context. + // Get all current ResolvedJavaMethod instances in the context. List inlineContext = getInlineContext(); // Reverse list such that inner method comes after outer method. diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/RiXirGenerator.java --- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/RiXirGenerator.java Thu Jul 05 21:39:22 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +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.max.cri.xir; - -import com.oracle.graal.api.meta.*; -import com.oracle.graal.api.meta.JavaType.*; - -/** - * Represents the interface through which the compiler requests the XIR for a given bytecode from the runtime system. - */ -public interface RiXirGenerator { - - XirSnippet genInvokeInterface(XirSite site, XirArgument receiver, JavaMethod method); - - XirSnippet genInvokeVirtual(XirSite site, XirArgument receiver, JavaMethod method, boolean megamorph); - - XirSnippet genInvokeSpecial(XirSite site, XirArgument receiver, JavaMethod method); - - XirSnippet genInvokeStatic(XirSite site, JavaMethod method); - - XirSnippet genMonitorEnter(XirSite site, XirArgument receiver, XirArgument lockAddress); - - XirSnippet genMonitorExit(XirSite site, XirArgument receiver, XirArgument lockAddress); - - XirSnippet genNewInstance(XirSite site, JavaType type); - - XirSnippet genNewArray(XirSite site, XirArgument length, Kind elementKind, JavaType componentType, JavaType arrayType); - - XirSnippet genNewMultiArray(XirSite site, XirArgument[] lengths, JavaType type); - - XirSnippet genCheckCast(XirSite site, XirArgument receiver, XirArgument hub, ResolvedJavaType type, JavaTypeProfile profile); - - XirSnippet genInstanceOf(XirSite site, XirArgument receiver, XirArgument hub, ResolvedJavaType type, JavaTypeProfile profile); - - XirSnippet genMaterializeInstanceOf(XirSite site, XirArgument receiver, XirArgument hub, XirArgument trueValue, XirArgument falseValue, ResolvedJavaType type, JavaTypeProfile profile); - - /** - * Generates code that checks that the {@linkplain Representation#ObjectHub hub} of - * an object is identical to a given hub constant. In pseudo code: - * 
-     *     if (object.getHub() != hub) {
-     *       jump(falseSuccessor)
-     *     }
-     *
- * This snippet should only be used when the object is guaranteed not to be null. - */ - XirSnippet genTypeBranch(XirSite site, XirArgument thisHub, XirArgument otherHub, JavaType type); - - /** - * Initializes the XIR generator for the given XIR assembler. - * - * @param asm the XIR assembler - */ - void initialize(XirAssembler asm); - -} diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirAssembler.java --- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirAssembler.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirAssembler.java Thu Jul 05 21:47:16 2012 +0200 @@ -385,7 +385,7 @@ } /** - * These marks let the RiXirGenerator mark positions in the generated native code and bring them in relationship with on another. + * These marks let the {@link XirGenerator} mark positions in the generated native code and bring them in relationship with on another. * This is necessary for code patching, etc. */ public static class XirMark { diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirGenerator.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirGenerator.java Thu Jul 05 21:47:16 2012 +0200 @@ -0,0 +1,76 @@ +/* + * 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.max.cri.xir; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.JavaType.*; + +/** + * Represents the interface through which the compiler requests the XIR for a given bytecode from the runtime system. + */ +public interface XirGenerator { + + XirSnippet genInvokeInterface(XirSite site, XirArgument receiver, JavaMethod method); + + XirSnippet genInvokeVirtual(XirSite site, XirArgument receiver, JavaMethod method, boolean megamorph); + + XirSnippet genInvokeSpecial(XirSite site, XirArgument receiver, JavaMethod method); + + XirSnippet genInvokeStatic(XirSite site, JavaMethod method); + + XirSnippet genMonitorEnter(XirSite site, XirArgument receiver, XirArgument lockAddress); + + XirSnippet genMonitorExit(XirSite site, XirArgument receiver, XirArgument lockAddress); + + XirSnippet genNewInstance(XirSite site, JavaType type); + + XirSnippet genNewArray(XirSite site, XirArgument length, Kind elementKind, JavaType componentType, JavaType arrayType); + + XirSnippet genNewMultiArray(XirSite site, XirArgument[] lengths, JavaType type); + + XirSnippet genCheckCast(XirSite site, XirArgument receiver, XirArgument hub, ResolvedJavaType type, JavaTypeProfile profile); + + XirSnippet genInstanceOf(XirSite site, XirArgument receiver, XirArgument hub, ResolvedJavaType type, JavaTypeProfile profile); + + XirSnippet genMaterializeInstanceOf(XirSite site, XirArgument receiver, XirArgument hub, XirArgument trueValue, XirArgument falseValue, ResolvedJavaType type, JavaTypeProfile profile); + + /** + * Generates code that checks that the {@linkplain Representation#ObjectHub hub} of + * an object is identical to a given hub constant. In pseudo code: + * 
+     *     if (object.getHub() != hub) {
+     *       jump(falseSuccessor)
+     *     }
+     *
+ * This snippet should only be used when the object is guaranteed not to be null. + */ + XirSnippet genTypeBranch(XirSite site, XirArgument thisHub, XirArgument otherHub, JavaType type); + + /** + * Initializes the XIR generator for the given XIR assembler. + * + * @param asm the XIR assembler + */ + void initialize(XirAssembler asm); + +} diff -r a1db0ea58b53 -r 2c088af17e59 graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSite.java --- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSite.java Thu Jul 05 21:39:22 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSite.java Thu Jul 05 21:47:16 2012 +0200 @@ -25,7 +25,7 @@ import com.oracle.graal.api.code.*; /** - * Encapsulates the notion of a site where XIR can be supplied. It is supplied to the {@link RiXirGenerator} by the + * Encapsulates the notion of a site where XIR can be supplied. It is supplied to the {@link XirGenerator} by the * compiler for each place where XIR can be generated. This interface allows a number of queries, including the * bytecode-level location and optimization hints computed by the compiler. */