Mercurial > hg > truffle
changeset 5718:10341299528c
renamings: ExtendedRiRuntime -> GraalCodeCacheProvider, CiLoweringTool -> LoweringTool, RiGraphCache -> GraphCache
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Jun 28 12:46:04 2012 +0200 @@ -54,7 +54,7 @@ /** * The runtime that this compiler has been configured for. */ - public final ExtendedRiRuntime runtime; + public final GraalCodeCacheProvider runtime; /** * The XIR generator that lowers Java operations to machine operations. @@ -66,7 +66,7 @@ */ public final Backend backend; - public GraalCompiler(ExtendedRiRuntime runtime, TargetDescription target, Backend backend, RiXirGenerator xirGen) { + public GraalCompiler(GraalCodeCacheProvider runtime, TargetDescription target, Backend backend, RiXirGenerator xirGen) { this.runtime = runtime; this.target = target; this.xir = xirGen; @@ -74,7 +74,7 @@ } - public CompilationResult compileMethod(final ResolvedJavaMethod method, final StructuredGraph graph, int osrBCI, final RiGraphCache cache, final PhasePlan plan, final OptimisticOptimizations optimisticOpts) { + public CompilationResult compileMethod(final ResolvedJavaMethod method, final StructuredGraph graph, int osrBCI, final GraphCache cache, final PhasePlan plan, final OptimisticOptimizations optimisticOpts) { assert (method.accessFlags() & Modifier.NATIVE) == 0 : "compiling native methods is not supported"; if (osrBCI != -1) { throw new BailoutException("No OSR supported"); @@ -105,7 +105,7 @@ /** * Builds the graph, optimizes it. */ - public LIR emitHIR(StructuredGraph graph, Assumptions assumptions, RiGraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { + public LIR emitHIR(StructuredGraph graph, Assumptions assumptions, GraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { if (graph.start().next() == null) { plan.runPhases(PhasePosition.AFTER_PARSING, graph);
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java Thu Jun 28 12:46:04 2012 +0200 @@ -191,13 +191,13 @@ } private final TargetDescription target; - private final ExtendedRiRuntime runtime; + private final GraalCodeCacheProvider runtime; private final Assumptions assumptions; - private final RiGraphCache cache; + private final GraphCache cache; private final PhasePlan plan; private final OptimisticOptimizations optimisticOpts; - public EscapeAnalysisPhase(TargetDescription target, ExtendedRiRuntime runtime, Assumptions assumptions, RiGraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { + public EscapeAnalysisPhase(TargetDescription target, GraalCodeCacheProvider runtime, Assumptions assumptions, GraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { this.runtime = runtime; this.target = target; this.assumptions = assumptions;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Thu Jun 28 12:46:04 2012 +0200 @@ -48,7 +48,7 @@ */ private final TargetDescription target; - private final ExtendedRiRuntime runtime; + private final GraalCodeCacheProvider runtime; private final Collection<? extends Invoke> hints; @@ -56,7 +56,7 @@ private Assumptions assumptions; private final PhasePlan plan; - private final RiGraphCache cache; + private final GraphCache cache; private final WeightComputationPolicy weightComputationPolicy; private final InliningPolicy inliningPolicy; private final OptimisticOptimizations optimisticOpts; @@ -66,7 +66,7 @@ private static final DebugMetric metricInliningConsidered = Debug.metric("InliningConsidered"); private static final DebugMetric metricInliningStoppedByMaxDesiredSize = Debug.metric("InliningStoppedByMaxDesiredSize"); - public InliningPhase(TargetDescription target, ExtendedRiRuntime runtime, Collection<? extends Invoke> hints, Assumptions assumptions, RiGraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { + public InliningPhase(TargetDescription target, GraalCodeCacheProvider runtime, Collection<? extends Invoke> hints, Assumptions assumptions, GraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { this.target = target; this.runtime = runtime; this.hints = hints;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IntrinsificationPhase.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IntrinsificationPhase.java Thu Jun 28 12:46:04 2012 +0200 @@ -31,9 +31,9 @@ public class IntrinsificationPhase extends Phase { - private final ExtendedRiRuntime runtime; + private final GraalCodeCacheProvider runtime; - public IntrinsificationPhase(ExtendedRiRuntime runtime) { + public IntrinsificationPhase(GraalCodeCacheProvider runtime) { this.runtime = runtime; } @@ -47,18 +47,18 @@ } } - public static boolean canIntrinsify(Invoke invoke, ResolvedJavaMethod target, ExtendedRiRuntime runtime) { + public static boolean canIntrinsify(Invoke invoke, ResolvedJavaMethod target, GraalCodeCacheProvider runtime) { return getIntrinsicGraph(invoke, target, runtime) != null; } - private static void tryIntrinsify(Invoke invoke, ExtendedRiRuntime runtime) { + private static void tryIntrinsify(Invoke invoke, GraalCodeCacheProvider runtime) { ResolvedJavaMethod target = invoke.callTarget().targetMethod(); if (target != null) { tryIntrinsify(invoke, target, runtime); } } - private static void tryIntrinsify(Invoke invoke, ResolvedJavaMethod target, ExtendedRiRuntime runtime) { + private static void tryIntrinsify(Invoke invoke, ResolvedJavaMethod target, GraalCodeCacheProvider runtime) { StructuredGraph intrinsicGraph = getIntrinsicGraph(invoke, target, runtime); if (intrinsicGraph != null) { Debug.log(" > Intrinsify %s", target); @@ -66,7 +66,7 @@ } } - private static StructuredGraph getIntrinsicGraph(Invoke invoke, ResolvedJavaMethod target, ExtendedRiRuntime runtime) { + private static StructuredGraph getIntrinsicGraph(Invoke invoke, ResolvedJavaMethod target, GraalCodeCacheProvider runtime) { StructuredGraph intrinsicGraph = (StructuredGraph) target.compilerStorage().get(Graph.class); if (intrinsicGraph == null) { // TODO remove once all intrinsics are available via compilerStorage
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoopFullUnrollPhase.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoopFullUnrollPhase.java Thu Jun 28 12:46:04 2012 +0200 @@ -30,9 +30,9 @@ public class LoopFullUnrollPhase extends Phase { private static final DebugMetric FULLY_UNROLLED_LOOPS = Debug.metric("FullUnrolls"); - private final ExtendedRiRuntime runtime; + private final GraalCodeCacheProvider runtime; - public LoopFullUnrollPhase(ExtendedRiRuntime runtime) { + public LoopFullUnrollPhase(GraalCodeCacheProvider runtime) { this.runtime = runtime; }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java Thu Jun 28 12:46:04 2012 +0200 @@ -38,10 +38,10 @@ */ public class LoweringPhase extends Phase { - private class LoweringToolBase implements CiLoweringTool { + private class LoweringToolBase implements LoweringTool { @Override - public ExtendedRiRuntime getRuntime() { + public GraalCodeCacheProvider getRuntime() { return runtime; } @@ -72,10 +72,10 @@ } } - private final ExtendedRiRuntime runtime; + private final GraalCodeCacheProvider runtime; private final Assumptions assumptions; - public LoweringPhase(ExtendedRiRuntime runtime, Assumptions assumptions) { + public LoweringPhase(GraalCodeCacheProvider runtime, Assumptions assumptions) { this.runtime = runtime; this.assumptions = assumptions; } @@ -101,7 +101,7 @@ // Step 2: lower the floating nodes processed.negate(); - final CiLoweringTool loweringTool = new LoweringToolBase(); + final LoweringTool loweringTool = new LoweringToolBase(); for (Node node : processed) { if (node instanceof Lowerable) { assert !(node instanceof FixedNode) || node.predecessor() == null : node; @@ -142,7 +142,7 @@ private void process(final Block b, final NodeBitMap activeGuards, NodeBitMap processed, final ValueNode anchor) { - final CiLoweringTool loweringTool = new LoweringToolBase() { + final LoweringTool loweringTool = new LoweringToolBase() { @Override public ValueNode getGuardAnchor() {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java Thu Jun 28 12:46:04 2012 +0200 @@ -125,7 +125,7 @@ * @param runtime * @param callback */ - public abstract void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback); + public abstract void inline(StructuredGraph graph, GraalCodeCacheProvider runtime, InliningCallback callback); } /** @@ -141,7 +141,7 @@ } @Override - public void inline(StructuredGraph compilerGraph, ExtendedRiRuntime runtime, final InliningCallback callback) { + public void inline(StructuredGraph compilerGraph, GraalCodeCacheProvider runtime, final InliningCallback callback) { StructuredGraph graph = getGraph(concrete, callback); assert !IntrinsificationPhase.canIntrinsify(invoke, concrete, runtime); callback.recordMethodContentsAssumption(concrete); @@ -184,7 +184,7 @@ } @Override - public void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { + public void inline(StructuredGraph graph, GraalCodeCacheProvider runtime, InliningCallback callback) { // receiver null check must be before the type check InliningUtil.receiverNullCheck(invoke); ValueNode receiver = invoke.callTarget().receiver(); @@ -250,7 +250,7 @@ } @Override - public void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { + public void inline(StructuredGraph graph, GraalCodeCacheProvider runtime, InliningCallback callback) { int numberOfMethods = concretes.size(); boolean hasReturnValue = invoke.node().kind() != Kind.Void; @@ -267,7 +267,7 @@ return notRecordedTypeProbability > 0; } - private void inlineMultipleMethods(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback, int numberOfMethods, boolean hasReturnValue) { + private void inlineMultipleMethods(StructuredGraph graph, GraalCodeCacheProvider runtime, InliningCallback callback, int numberOfMethods, boolean hasReturnValue) { FixedNode continuation = invoke.next(); // setup merge and phi nodes for results and exceptions @@ -373,7 +373,7 @@ return commonType; } - private void inlineSingleMethod(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { + private void inlineSingleMethod(StructuredGraph graph, GraalCodeCacheProvider runtime, InliningCallback callback) { assert concretes.size() == 1 && ptypes.length > 1 && !shouldFallbackToInvoke() && notRecordedTypeProbability == 0; MergeNode calleeEntryNode = graph.add(new MergeNode()); @@ -512,7 +512,7 @@ } @Override - public void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { + public void inline(StructuredGraph graph, GraalCodeCacheProvider runtime, InliningCallback callback) { if (Debug.isLogEnabled()) { String targetName = CodeUtil.format("%H.%n(%p):%r", invoke.callTarget().targetMethod()); String concreteName = CodeUtil.format("%H.%n(%p):%r", concrete); @@ -542,7 +542,7 @@ * @param callback a callback that is used to determine the weight of a specific inlining * @return an instance of InlineInfo, or null if no inlining is possible at the given invoke */ - public static InlineInfo getInlineInfo(Invoke invoke, int level, ExtendedRiRuntime runtime, Assumptions assumptions, InliningCallback callback, OptimisticOptimizations optimisticOpts) { + public static InlineInfo getInlineInfo(Invoke invoke, int level, GraalCodeCacheProvider runtime, Assumptions assumptions, InliningCallback callback, OptimisticOptimizations optimisticOpts) { ResolvedJavaMethod parent = invoke.stateAfter().method(); MethodCallTargetNode callTarget = invoke.callTarget(); ResolvedJavaMethod targetMethod = callTarget.targetMethod();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Jun 28 12:46:04 2012 +0200 @@ -204,7 +204,7 @@ @SuppressWarnings("unchecked") @Override public <T> T getCapability(Class<T> clazz) { - if (clazz == ExtendedRiRuntime.class || clazz == MetaAccessProvider.class) { + if (clazz == GraalCodeCacheProvider.class || clazz == MetaAccessProvider.class) { return (T) getRuntime(); } if (clazz == GraalCompiler.class) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java Thu Jun 28 12:46:04 2012 +0200 @@ -51,7 +51,7 @@ * The {@link #cachedGraphIds} map is used to find the graphs that should be removed because of deoptimization, and to * enforce the graph cache size restriction. */ -public class HotSpotGraphCache implements RiGraphCache { +public class HotSpotGraphCache implements GraphCache { private static final PrintStream out = System.out;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Thu Jun 28 12:46:04 2012 +0200 @@ -51,7 +51,7 @@ /** * CRI runtime implementation for the HotSpot VM. */ -public class HotSpotRuntime implements ExtendedRiRuntime { +public class HotSpotRuntime implements GraalCodeCacheProvider { public final HotSpotVMConfig config; final HotSpotRegisterConfig regConfig; private final HotSpotRegisterConfig globalStubRegConfig; @@ -227,7 +227,7 @@ } @Override - public void lower(Node n, CiLoweringTool tool) { + public void lower(Node n, LoweringTool tool) { StructuredGraph graph = (StructuredGraph) n.graph(); if (n instanceof ArrayLengthNode) { ArrayLengthNode arrayLengthNode = (ArrayLengthNode) n; @@ -403,7 +403,7 @@ return safeRead(array.graph(), Kind.Int, array, config.arrayLengthOffset, StampFactory.positiveInt(), leafGraphId); } - private static ValueNode createBoundsCheck(AccessIndexedNode n, CiLoweringTool tool) { + private static ValueNode createBoundsCheck(AccessIndexedNode n, LoweringTool tool) { StructuredGraph graph = (StructuredGraph) n.graph(); ArrayLengthNode arrayLength = graph.add(new ArrayLengthNode(n.array())); ValueNode guard = tool.createGuard(graph.unique(new IntegerBelowThanNode(n.index(), arrayLength)), DeoptimizationReason.BoundsCheckException, DeoptimizationAction.InvalidateReprofile, n.leafGraphId());
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/InitializeNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/InitializeNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -54,7 +54,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TLABAllocateNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TLABAllocateNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -47,7 +47,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/CheckCastSnippets.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/CheckCastSnippets.java Thu Jun 28 12:46:04 2012 +0200 @@ -353,7 +353,7 @@ /** * Lowers a checkcast node. */ - public void lower(CheckCastNode checkcast, CiLoweringTool tool) { + public void lower(CheckCastNode checkcast, LoweringTool tool) { StructuredGraph graph = (StructuredGraph) checkcast.graph(); ValueNode hub = checkcast.targetClassInstruction(); ValueNode object = checkcast.object();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/DirectObjectStoreNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/DirectObjectStoreNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -59,7 +59,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { StructuredGraph graph = (StructuredGraph) this.graph(); IndexedLocationNode location = IndexedLocationNode.create(LocationNode.ANY_LOCATION, value.kind(), displacement, offset, graph, false); WriteNode write = graph.add(new WriteNode(object, value, location));
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/IntrinsifyArrayCopyPhase.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/IntrinsifyArrayCopyPhase.java Thu Jun 28 12:46:04 2012 +0200 @@ -36,7 +36,7 @@ import com.oracle.graal.nodes.java.*; public class IntrinsifyArrayCopyPhase extends Phase { - private final ExtendedRiRuntime runtime; + private final GraalCodeCacheProvider runtime; private ResolvedJavaMethod arrayCopy; private ResolvedJavaMethod byteArrayCopy; private ResolvedJavaMethod shortArrayCopy; @@ -47,7 +47,7 @@ private ResolvedJavaMethod doubleArrayCopy; private ResolvedJavaMethod objectArrayCopy; - public IntrinsifyArrayCopyPhase(ExtendedRiRuntime runtime) { + public IntrinsifyArrayCopyPhase(GraalCodeCacheProvider runtime) { this.runtime = runtime; try { byteArrayCopy = getArrayCopySnippet(runtime, byte.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/NewInstanceSnippets.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/NewInstanceSnippets.java Thu Jun 28 12:46:04 2012 +0200 @@ -176,7 +176,7 @@ * Lowers a {@link NewInstanceNode}. */ @SuppressWarnings("unused") - public void lower(NewInstanceNode newInstanceNode, CiLoweringTool tool) { + public void lower(NewInstanceNode newInstanceNode, LoweringTool tool) { StructuredGraph graph = (StructuredGraph) newInstanceNode.graph(); HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) newInstanceNode.instanceClass(); HotSpotKlassOop hub = type.klassOop(); @@ -197,7 +197,7 @@ } @SuppressWarnings("unused") - public void lower(TLABAllocateNode tlabAllocateNode, CiLoweringTool tool) { + public void lower(TLABAllocateNode tlabAllocateNode, LoweringTool tool) { StructuredGraph graph = (StructuredGraph) tlabAllocateNode.graph(); int size = tlabAllocateNode.size(); assert (size % wordSize()) == 0; @@ -210,7 +210,7 @@ } @SuppressWarnings("unused") - public void lower(InitializeNode initializeNode, CiLoweringTool tool) { + public void lower(InitializeNode initializeNode, LoweringTool tool) { StructuredGraph graph = (StructuredGraph) initializeNode.graph(); HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) initializeNode.type(); HotSpotKlassOop hub = type.klassOop();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java Thu Jun 28 11:30:21 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2011, 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.cri; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.api.meta.*; -import com.oracle.graal.nodes.*; - -public interface CiLoweringTool { - ExtendedRiRuntime getRuntime(); - ValueNode getGuardAnchor(); - ValueNode createNullCheckGuard(ValueNode object, long leafGraphId); - ValueNode createGuard(BooleanNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, long leafGraphId); - ValueNode createGuard(BooleanNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, boolean negated, long leafGraphId); - Assumptions assumptions(); -} -
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/ExtendedRiRuntime.java Thu Jun 28 11:30:21 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2011, 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.cri; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.api.meta.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; - -/** - * Graal-specific extensions for the runtime interface that must be implemented by the VM. - */ -public interface ExtendedRiRuntime extends CodeCacheProvider { - - void lower(Node n, CiLoweringTool tool); - - StructuredGraph intrinsicGraph(ResolvedJavaMethod caller, int bci, ResolvedJavaMethod method, List<? extends Node> parameters); - - CompilationResult compile(ResolvedJavaMethod method, StructuredGraph graph); - -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/GraalCodeCacheProvider.java Thu Jun 28 12:46:04 2012 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011, 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.cri; + +import java.util.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.graph.*; +import com.oracle.graal.nodes.*; + +/** + * Graal-specific extensions for the code cache provider interface. + */ +public interface GraalCodeCacheProvider extends CodeCacheProvider { + + void lower(Node n, LoweringTool tool); + + StructuredGraph intrinsicGraph(ResolvedJavaMethod caller, int bci, ResolvedJavaMethod method, List<? extends Node> parameters); + + CompilationResult compile(ResolvedJavaMethod method, StructuredGraph graph); + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/GraphCache.java Thu Jun 28 12:46:04 2012 +0200 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2012, 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.cri; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.nodes.*; + + +public interface GraphCache { + + void put(StructuredGraph graph); + + StructuredGraph get(ResolvedJavaMethod method); + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/LoweringTool.java Thu Jun 28 12:46:04 2012 +0200 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2011, 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.cri; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.nodes.*; + +public interface LoweringTool { + GraalCodeCacheProvider getRuntime(); + ValueNode getGuardAnchor(); + ValueNode createNullCheckGuard(ValueNode object, long leafGraphId); + ValueNode createGuard(BooleanNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, long leafGraphId); + ValueNode createGuard(BooleanNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, boolean negated, long leafGraphId); + Assumptions assumptions(); +} +
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/RiGraphCache.java Thu Jun 28 11:30:21 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2012, 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.cri; - -import com.oracle.graal.api.meta.*; -import com.oracle.graal.nodes.*; - - -public interface RiGraphCache { - - void put(StructuredGraph graph); - - StructuredGraph get(ResolvedJavaMethod method); - -}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -92,7 +92,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { ValueAnchorNode newAnchor = graph().add(new ValueAnchorNode(tool.createGuard(condition, deoptReason, action, negated, leafGraphId))); ((StructuredGraph) graph()).replaceFixedWithFixed(this, newAnchor); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -46,7 +46,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { StructuredGraph graph = (StructuredGraph) graph(); BooleanNode equalComp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadHubNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadHubNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -44,7 +44,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -35,7 +35,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { StructuredGraph graph = (StructuredGraph) graph(); ValueNode guard = tool.createNullCheckGuard(object(), leafGraphId()); ReadNode read = graph.add(new ReadNode(object(), location(), stamp()));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -56,7 +56,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { StructuredGraph graph = (StructuredGraph) graph(); ValueNode guard = tool.createNullCheckGuard(object(), leafGraphId()); WriteNode write = graph.add(new WriteNode(object(), value(), location()));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -71,7 +71,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -92,7 +92,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -88,7 +88,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -63,7 +63,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -60,7 +60,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -77,7 +77,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -56,7 +56,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -57,7 +57,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Thu Jun 28 12:46:04 2012 +0200 @@ -67,7 +67,7 @@ } @Override - public void lower(CiLoweringTool tool) { + public void lower(LoweringTool tool) { tool.getRuntime().lower(this, tool); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Thu Jun 28 12:46:04 2012 +0200 @@ -26,5 +26,5 @@ public interface Lowerable { - void lower(CiLoweringTool tool); + void lower(LoweringTool tool); }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetInstaller.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetInstaller.java Thu Jun 28 12:46:04 2012 +0200 @@ -45,7 +45,7 @@ */ public class SnippetInstaller { - private final ExtendedRiRuntime runtime; + private final GraalCodeCacheProvider runtime; private final TargetDescription target; private final BoxingMethodPool pool; @@ -57,7 +57,7 @@ */ private final Map<ResolvedJavaMethod, StructuredGraph> graphCache; - public SnippetInstaller(ExtendedRiRuntime runtime, TargetDescription target) { + public SnippetInstaller(GraalCodeCacheProvider runtime, TargetDescription target) { this.runtime = runtime; this.target = target; this.pool = new BoxingMethodPool(runtime);
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraalCompilerTest.java Thu Jun 28 11:30:21 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraalCompilerTest.java Thu Jun 28 12:46:04 2012 +0200 @@ -61,11 +61,11 @@ */ public abstract class GraalCompilerTest { - protected final ExtendedRiRuntime runtime; + protected final GraalCodeCacheProvider runtime; public GraalCompilerTest() { Debug.enable(); - this.runtime = Graal.getRuntime().getCapability(ExtendedRiRuntime.class); + this.runtime = Graal.getRuntime().getCapability(GraalCodeCacheProvider.class); } protected void assertEquals(StructuredGraph expected, StructuredGraph graph) { @@ -127,7 +127,7 @@ return result.toString(); } - protected ExtendedRiRuntime runtime() { + protected GraalCodeCacheProvider runtime() { return runtime; }