Mercurial > hg > truffle
changeset 18525:c538c2c6b7e2
changed most references to HotSpotGraalRuntime to use HotSpotGraalRuntimeProvider instead
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Wed Nov 26 11:48:34 2014 +0100 @@ -57,7 +57,7 @@ */ public class AMD64HotSpotBackend extends HotSpotHostBackend { - public AMD64HotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + public AMD64HotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { super(runtime, providers); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Wed Nov 26 11:48:34 2014 +0100 @@ -110,7 +110,7 @@ } @Override - public HotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotBackend host) { + public HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, HotSpotBackend host) { assert host == null; TargetDescription target = createTarget(runtime.getConfig()); @@ -175,7 +175,7 @@ } } - protected AMD64HotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + protected AMD64HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { return new AMD64HotSpotBackend(runtime, providers); } @@ -183,44 +183,44 @@ return new HotSpotRegisters(AMD64.r15, AMD64.r12, AMD64.rsp); } - protected HotSpotDisassemblerProvider createDisassembler(HotSpotGraalRuntime runtime) { + protected HotSpotDisassemblerProvider createDisassembler(HotSpotGraalRuntimeProvider runtime) { return new HotSpotDisassemblerProvider(runtime); } - protected Replacements createReplacements(HotSpotGraalRuntime runtime, Assumptions assumptions, Providers p, SnippetReflectionProvider snippetReflection) { + protected Replacements createReplacements(HotSpotGraalRuntimeProvider runtime, Assumptions assumptions, Providers p, SnippetReflectionProvider snippetReflection) { return new HotSpotReplacementsImpl(p, snippetReflection, runtime.getConfig(), assumptions, p.getCodeCache().getTarget()); } - protected AMD64HotSpotForeignCallsProvider createForeignCalls(HotSpotGraalRuntime runtime, HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, + protected AMD64HotSpotForeignCallsProvider createForeignCalls(HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, Value[] nativeABICallerSaveRegisters) { return new AMD64HotSpotForeignCallsProvider(runtime, metaAccess, codeCache, nativeABICallerSaveRegisters); } - protected HotSpotConstantReflectionProvider createConstantReflection(HotSpotGraalRuntime runtime) { + protected HotSpotConstantReflectionProvider createConstantReflection(HotSpotGraalRuntimeProvider runtime) { return new HotSpotConstantReflectionProvider(runtime); } - protected RegisterConfig createRegisterConfig(HotSpotGraalRuntime runtime, TargetDescription target) { + protected RegisterConfig createRegisterConfig(HotSpotGraalRuntimeProvider runtime, TargetDescription target) { return new AMD64HotSpotRegisterConfig(target.arch, runtime.getConfig()); } - protected HotSpotCodeCacheProvider createCodeCache(HotSpotGraalRuntime runtime, TargetDescription target, RegisterConfig regConfig) { + protected HotSpotCodeCacheProvider createCodeCache(HotSpotGraalRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) { return new HotSpotCodeCacheProvider(runtime, target, regConfig); } - protected HotSpotMetaAccessProvider createMetaAccess(HotSpotGraalRuntime runtime) { + protected HotSpotMetaAccessProvider createMetaAccess(HotSpotGraalRuntimeProvider runtime) { return new HotSpotMetaAccessProvider(runtime); } - protected HotSpotSuitesProvider createSuites(HotSpotGraalRuntime runtime) { + protected HotSpotSuitesProvider createSuites(HotSpotGraalRuntimeProvider runtime) { return new HotSpotSuitesProvider(runtime); } - protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalRuntime runtime) { + protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalRuntimeProvider runtime) { return new HotSpotSnippetReflectionProvider(runtime); } - protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntime runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, + protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { return new AMD64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, target); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -42,7 +42,7 @@ private final Value[] nativeABICallerSaveRegisters; - public AMD64HotSpotForeignCallsProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache, Value[] nativeABICallerSaveRegisters) { + public AMD64HotSpotForeignCallsProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache, Value[] nativeABICallerSaveRegisters) { super(runtime, metaAccess, codeCache); this.nativeABICallerSaveRegisters = nativeABICallerSaveRegisters; }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -35,7 +35,7 @@ private AMD64ConvertSnippets.Templates convertSnippets; - public AMD64HotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { + public AMD64HotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { super(runtime, metaAccess, foreignCalls, registers, target); }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Wed Nov 26 11:48:34 2014 +0100 @@ -99,7 +99,7 @@ // TODO: get maximum Concurrency from okra private int maxDeoptIndex = 8 * 40 * 64; // see gpu_hsail.hpp - public HSAILHotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + public HSAILHotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { super(runtime, providers); paramTypeMap.put("HotSpotResolvedPrimitiveType<int>", "s32"); paramTypeMap.put("HotSpotResolvedPrimitiveType<float>", "f32");
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Wed Nov 26 11:48:34 2014 +0100 @@ -36,13 +36,13 @@ @ServiceProvider(HotSpotBackendFactory.class) public class HSAILHotSpotBackendFactory implements HotSpotBackendFactory { - protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, + protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { return new HSAILHotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, target); } @Override - public HSAILHotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotBackend hostBackend) { + public HSAILHotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, HotSpotBackend hostBackend) { HotSpotProviders host = hostBackend.getProviders(); HotSpotRegisters registers = new HotSpotRegisters(HSAIL.threadRegister, Register.None, Register.None);
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotCodeCacheProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotCodeCacheProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -30,7 +30,7 @@ public class HSAILHotSpotCodeCacheProvider extends HotSpotCodeCacheProvider { - public HSAILHotSpotCodeCacheProvider(HotSpotGraalRuntime runtime, TargetDescription target) { + public HSAILHotSpotCodeCacheProvider(HotSpotGraalRuntimeProvider runtime, TargetDescription target) { super(runtime, target, new HSAILHotSpotRegisterConfig()); }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotForeignCallsProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotForeignCallsProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -29,7 +29,7 @@ public class HSAILHotSpotForeignCallsProvider extends HotSpotForeignCallsProviderImpl { - public HSAILHotSpotForeignCallsProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) { + public HSAILHotSpotForeignCallsProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) { super(runtime, metaAccess, codeCache); }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -121,7 +121,7 @@ return strategyMap.get(n.getNodeClass()); } - public HSAILHotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { + public HSAILHotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { super(runtime, metaAccess, foreignCalls, registers, target); initStrategyMap(); }
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Wed Nov 26 11:48:34 2014 +0100 @@ -100,7 +100,7 @@ // @formatter:on - public PTXHotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + public PTXHotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { super(runtime, providers); if (OmitDeviceInit) { deviceInitialized = true;
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackendFactory.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackendFactory.java Wed Nov 26 11:48:34 2014 +0100 @@ -37,7 +37,7 @@ @ServiceProvider(HotSpotBackendFactory.class) public class PTXHotSpotBackendFactory implements HotSpotBackendFactory { - public HotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotBackend hostBackend) { + public HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, HotSpotBackend hostBackend) { HotSpotProviders host = hostBackend.getProviders(); MetaAccessProvider metaAccess; PTXHotSpotCodeCacheProvider codeCache;
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotCodeCacheProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotCodeCacheProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -30,7 +30,7 @@ public class PTXHotSpotCodeCacheProvider extends HotSpotCodeCacheProvider { - public PTXHotSpotCodeCacheProvider(HotSpotGraalRuntime runtime, TargetDescription target) { + public PTXHotSpotCodeCacheProvider(HotSpotGraalRuntimeProvider runtime, TargetDescription target) { super(runtime, target, new PTXHotSpotRegisterConfig()); }
--- a/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/CompilationServer.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/CompilationServer.java Wed Nov 26 11:48:34 2014 +0100 @@ -44,9 +44,9 @@ public interface ConnectionObserver { - void connectionStarted(HotSpotGraalRuntime compiler); + void connectionStarted(HotSpotGraalRuntimeProvider compiler); - void connectionFinished(HotSpotGraalRuntime compiler); + void connectionFinished(HotSpotGraalRuntimeProvider compiler); } private final boolean multiple; @@ -55,7 +55,7 @@ /** * Creates a new Compilation server. The server is activated by calling {@link #run()} directly * or via a new {@link Thread}. - * + * * @param multiple true if the server should server should serve an infinite amount of * consecutive connections, false if it should terminate after the first connection * ends. @@ -92,7 +92,7 @@ CompilerToVM toVM = (CompilerToVM) streams.getInvocation().waitForResult(false); // return the initialized compiler to the client - HotSpotGraalRuntime compiler = initializeServer(toVM); + HotSpotGraalRuntimeProvider compiler = initializeServer(toVM); streams.getInvocation().sendResult(compiler); for (ConnectionObserver observer : observers) { @@ -120,7 +120,7 @@ } @SuppressWarnings("unused") - private static HotSpotGraalRuntime initializeServer(CompilerToVM toVM) { + private static HotSpotGraalRuntimeProvider initializeServer(CompilerToVM toVM) { // TODO(thomaswue): Fix creation of compiler instances on server side. return null; }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Wed Nov 26 11:48:34 2014 +0100 @@ -63,7 +63,7 @@ */ public class SPARCHotSpotBackend extends HotSpotHostBackend { - public SPARCHotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + public SPARCHotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { super(runtime, providers); }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Wed Nov 26 11:48:34 2014 +0100 @@ -48,7 +48,7 @@ return new HotSpotTargetDescription(createArchitecture(config), true, stackFrameAlignment, implicitNullCheckLimit, inlineObjects); } - public HotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotBackend host) { + public HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, HotSpotBackend host) { assert host == null; TargetDescription target = createTarget(runtime.getConfig());
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -39,7 +39,7 @@ private final Value[] nativeABICallerSaveRegisters; - public SPARCHotSpotForeignCallsProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache, Value[] nativeABICallerSaveRegisters) { + public SPARCHotSpotForeignCallsProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache, Value[] nativeABICallerSaveRegisters) { super(runtime, metaAccess, codeCache); this.nativeABICallerSaveRegisters = nativeABICallerSaveRegisters; }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -32,7 +32,7 @@ public class SPARCHotSpotLoweringProvider extends DefaultHotSpotLoweringProvider { - public SPARCHotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { + public SPARCHotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { super(runtime, metaAccess, foreignCalls, registers, target); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Wed Nov 26 11:48:34 2014 +0100 @@ -143,7 +143,7 @@ } // Some runtime instances we need. - private final HotSpotGraalRuntime runtime = runtime(); + private final HotSpotGraalRuntimeProvider runtime = runtime(); /** List of Zip/Jar files to compile (see {@link Options#CompileTheWorldClasspath}). */ private final String files;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Wed Nov 26 11:48:34 2014 +0100 @@ -73,7 +73,7 @@ */ public static final ForeignCallDescriptor EXCEPTION_HANDLER_IN_CALLER = new ForeignCallDescriptor("exceptionHandlerInCaller", void.class, Object.class, Word.class); - private final HotSpotGraalRuntime runtime; + private final HotSpotGraalRuntimeProvider runtime; /** * @see DeoptimizationFetchUnrollInfoCallNode @@ -130,12 +130,12 @@ */ public static final ForeignCallDescriptor UNCOMMON_TRAP = new ForeignCallDescriptor("uncommonTrap", Word.class, Word.class, int.class); - public HotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + public HotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { super(providers); this.runtime = runtime; } - public HotSpotGraalRuntime getRuntime() { + public HotSpotGraalRuntimeProvider getRuntime() { return runtime; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackendFactory.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackendFactory.java Wed Nov 26 11:48:34 2014 +0100 @@ -27,7 +27,7 @@ public interface HotSpotBackendFactory extends Service { - HotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotBackend host); + HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, HotSpotBackend host); /** * Gets the CPU architecture of this backend.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Wed Nov 26 11:48:34 2014 +0100 @@ -53,7 +53,7 @@ */ protected final int pagesToBang; - public HotSpotHostBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + public HotSpotHostBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { super(runtime, providers); this.pagesToBang = runtime.getConfig().useStackBanging ? runtime.getConfig().stackShadowPages : 0; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVmSymbols.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVmSymbols.java Wed Nov 26 11:48:34 2014 +0100 @@ -39,7 +39,7 @@ * @return the symbol at position id */ public static String symbolAt(int index) { - HotSpotGraalRuntime runtime = runtime(); + HotSpotGraalRuntimeProvider runtime = runtime(); HotSpotVMConfig config = runtime.getConfig(); assert config.vmSymbolsFirstSID <= index && index < config.vmSymbolsSIDLimit : "index " + index + " is out of bounds"; assert config.symbolPointerSize == Unsafe.ADDRESS_SIZE : "the following address read is broken";
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -52,11 +52,11 @@ */ public class HotSpotCodeCacheProvider implements CodeCacheProvider { - protected final HotSpotGraalRuntime runtime; + protected final HotSpotGraalRuntimeProvider runtime; protected final TargetDescription target; protected final RegisterConfig regConfig; - public HotSpotCodeCacheProvider(HotSpotGraalRuntime runtime, TargetDescription target, RegisterConfig regConfig) { + public HotSpotCodeCacheProvider(HotSpotGraalRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) { this.runtime = runtime; this.target = target; this.regConfig = regConfig;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Wed Nov 26 11:48:34 2014 +0100 @@ -439,7 +439,7 @@ * @param metaspacePointer either a metaspace Klass or a metaspace Symbol */ private static JavaType getJavaType(final long metaspacePointer) { - HotSpotGraalRuntime runtime = runtime(); + HotSpotGraalRuntimeProvider runtime = runtime(); HotSpotVMConfig config = runtime.getConfig(); if ((metaspacePointer & config.compilerToVMSymbolTag) != 0) { final long metaspaceSymbol = metaspacePointer & ~config.compilerToVMSymbolTag;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -44,11 +44,11 @@ public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider { private static final String SystemClassName = "Ljava/lang/System;"; - protected final HotSpotGraalRuntime runtime; + protected final HotSpotGraalRuntimeProvider runtime; protected final HotSpotMethodHandleAccessProvider methodHandleAccess; protected final HotSpotMemoryAccessProviderImpl memoryAccess; - public HotSpotConstantReflectionProvider(HotSpotGraalRuntime runtime) { + public HotSpotConstantReflectionProvider(HotSpotGraalRuntimeProvider runtime) { this.runtime = runtime; this.methodHandleAccess = new HotSpotMethodHandleAccessProvider(this); this.memoryAccess = new HotSpotMemoryAccessProviderImpl(runtime);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotDisassemblerProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotDisassemblerProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -30,9 +30,9 @@ */ public class HotSpotDisassemblerProvider implements DisassemblerProvider { - protected final HotSpotGraalRuntime runtime; + protected final HotSpotGraalRuntimeProvider runtime; - public HotSpotDisassemblerProvider(HotSpotGraalRuntime runtime) { + public HotSpotDisassemblerProvider(HotSpotGraalRuntimeProvider runtime) { this.runtime = runtime; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java Wed Nov 26 11:48:34 2014 +0100 @@ -48,13 +48,13 @@ public static final ForeignCallDescriptor TEST_DEOPTIMIZE_CALL_INT = new ForeignCallDescriptor("test_deoptimize_call_int", int.class, int.class); - protected final HotSpotGraalRuntime runtime; + protected final HotSpotGraalRuntimeProvider runtime; protected final Map<ForeignCallDescriptor, HotSpotForeignCallLinkage> foreignCalls = new HashMap<>(); protected final MetaAccessProvider metaAccess; protected final CodeCacheProvider codeCache; - public HotSpotForeignCallsProviderImpl(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) { + public HotSpotForeignCallsProviderImpl(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) { this.runtime = runtime; this.metaAccess = metaAccess; this.codeCache = codeCache;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -58,7 +58,7 @@ */ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCallsProviderImpl { - public HotSpotHostForeignCallsProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) { + public HotSpotHostForeignCallsProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) { super(runtime, metaAccess, codeCache); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMemoryAccessProviderImpl.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMemoryAccessProviderImpl.java Wed Nov 26 11:48:34 2014 +0100 @@ -35,9 +35,9 @@ */ public class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider { - protected final HotSpotGraalRuntime runtime; + protected final HotSpotGraalRuntimeProvider runtime; - public HotSpotMemoryAccessProviderImpl(HotSpotGraalRuntime runtime) { + public HotSpotMemoryAccessProviderImpl(HotSpotGraalRuntimeProvider runtime) { this.runtime = runtime; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -40,9 +40,9 @@ */ public class HotSpotMetaAccessProvider implements MetaAccessProvider { - protected final HotSpotGraalRuntime runtime; + protected final HotSpotGraalRuntimeProvider runtime; - public HotSpotMetaAccessProvider(HotSpotGraalRuntime runtime) { + public HotSpotMetaAccessProvider(HotSpotGraalRuntimeProvider runtime) { this.runtime = runtime; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Wed Nov 26 11:29:24 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Wed Nov 26 11:48:34 2014 +0100 @@ -42,9 +42,9 @@ protected final DerivedOptionValue<Suites> defaultSuites; protected final PhaseSuite<HighTierContext> defaultGraphBuilderSuite; - protected final HotSpotGraalRuntime runtime; + protected final HotSpotGraalRuntimeProvider runtime; - public HotSpotSuitesProvider(HotSpotGraalRuntime runtime) { + public HotSpotSuitesProvider(HotSpotGraalRuntimeProvider runtime) { this.runtime = runtime; this.defaultGraphBuilderSuite = createGraphBuilderSuite(); this.defaultSuites = new DerivedOptionValue<>(this);