Mercurial > hg > truffle
changeset 12431:7080a96be216
rename: graalRuntime -> runtime, getGraalRuntime -> getRuntime
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXTargetMethodAssembler.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXTargetMethodAssembler.java Tue Oct 15 22:21:01 2013 +0200 @@ -33,7 +33,7 @@ public class PTXTargetMethodAssembler extends TargetMethodAssembler { - private static CompilerToGPU toGPU = HotSpotGraalRuntime.graalRuntime().getCompilerToGPU(); + private static CompilerToGPU toGPU = HotSpotGraalRuntime.runtime().getCompilerToGPU(); private static boolean validDevice = toGPU.deviceInit(); @@ -45,7 +45,8 @@ // detach ?? - public PTXTargetMethodAssembler(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, CompilationResult compilationResult) { + public PTXTargetMethodAssembler(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, + CompilationResult compilationResult) { super(codeCache, foreignCalls, frameMap, asm, frameContext, compilationResult); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Tue Oct 15 22:21:01 2013 +0200 @@ -58,8 +58,8 @@ private static final Unsafe unsafe = Unsafe.getUnsafe(); - public AMD64HotSpotBackend(HotSpotGraalRuntime graalRuntime, HotSpotProviders providers) { - super(graalRuntime, providers); + public AMD64HotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + super(runtime, providers); } @Override @@ -74,7 +74,7 @@ @Override public LIRGenerator newLIRGenerator(StructuredGraph graph, FrameMap frameMap, CallingConvention cc, LIR lir) { - return new AMD64HotSpotLIRGenerator(graph, getProviders(), getGraalRuntime().getConfig(), frameMap, cc, lir); + return new AMD64HotSpotLIRGenerator(graph, getProviders(), getRuntime().getConfig(), frameMap, cc, lir); } /** @@ -235,7 +235,7 @@ AMD64MacroAssembler asm = (AMD64MacroAssembler) tasm.asm; FrameMap frameMap = tasm.frameMap; RegisterConfig regConfig = frameMap.registerConfig; - HotSpotVMConfig config = getGraalRuntime().getConfig(); + HotSpotVMConfig config = getRuntime().getConfig(); Label verifiedStub = new Label(); // Emit the prefix
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -37,8 +37,8 @@ @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { // reset last Java frame: - HotSpotVMConfig config = graalRuntime().getConfig(); - Register thread = graalRuntime().getProviders().getRegisters().getThreadRegister(); + HotSpotVMConfig config = runtime().getConfig(); + Register thread = runtime().getProviders().getRegisters().getThreadRegister(); masm.movslq(new AMD64Address(thread, config.threadLastJavaSpOffset), 0); masm.movslq(new AMD64Address(thread, config.threadLastJavaFpOffset), 0);
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -38,7 +38,7 @@ public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { // save last Java frame - Register thread = graalRuntime().getProviders().getRegisters().getThreadRegister(); - masm.movq(new AMD64Address(thread, graalRuntime().getConfig().threadLastJavaSpOffset), rsp); + Register thread = runtime().getProviders().getRegisters().getThreadRegister(); + masm.movq(new AMD64Address(thread, runtime().getConfig().threadLastJavaSpOffset), rsp); } }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCodeCacheProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCodeCacheProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -28,13 +28,13 @@ public class AMD64HotSpotCodeCacheProvider extends HotSpotCodeCacheProvider { - public AMD64HotSpotCodeCacheProvider(HotSpotGraalRuntime graalRuntime) { - super(graalRuntime); + public AMD64HotSpotCodeCacheProvider(HotSpotGraalRuntime runtime) { + super(runtime); } @Override protected RegisterConfig createRegisterConfig() { - return new AMD64HotSpotRegisterConfig(graalRuntime.getTarget().arch, graalRuntime.getConfig()); + return new AMD64HotSpotRegisterConfig(runtime.getTarget().arch, runtime.getConfig()); } }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -41,14 +41,14 @@ public class AMD64HotSpotForeignCallsProvider extends HotSpotForeignCallsProvider { - public AMD64HotSpotForeignCallsProvider(HotSpotGraalRuntime graalRuntime) { - super(graalRuntime); + public AMD64HotSpotForeignCallsProvider(HotSpotGraalRuntime runtime) { + super(runtime); } @Override public void initialize(HotSpotProviders providers) { - Kind word = graalRuntime.getTarget().wordKind; - HotSpotVMConfig config = graalRuntime.getConfig(); + Kind word = runtime.getTarget().wordKind; + HotSpotVMConfig config = runtime.getConfig(); // The calling convention for the exception handler stub is (only?) defined in // TemplateInterpreterGenerator::generate_throw_exception()
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotGraalRuntime.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotGraalRuntime.java Tue Oct 15 22:21:01 2013 +0200 @@ -45,17 +45,17 @@ * Called from C++ code to retrieve the singleton instance, creating it first if necessary. */ public static HotSpotGraalRuntime makeInstance() { - HotSpotGraalRuntime graalRuntime = graalRuntime(); - if (graalRuntime == null) { + HotSpotGraalRuntime runtime = runtime(); + if (runtime == null) { HotSpotGraalRuntimeFactory factory = findFactory("AMD64"); if (factory != null) { - graalRuntime = factory.createRuntime(); + runtime = factory.createRuntime(); } else { - graalRuntime = new AMD64HotSpotGraalRuntime(); + runtime = new AMD64HotSpotGraalRuntime(); } - graalRuntime.completeInitialization(); + runtime.completeInitialization(); } - return graalRuntime; + return runtime; } protected Architecture createArchitecture() {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -59,8 +59,8 @@ masm.incrementq(rsp, 8); // Restore rsp from rbp if the exception PC is a method handle call site. - Register thread = graalRuntime().getProviders().getRegisters().getThreadRegister(); - int isMethodHandleReturnOffset = graalRuntime().getConfig().threadIsMethodHandleReturnOffset; + Register thread = runtime().getProviders().getRegisters().getThreadRegister(); + int isMethodHandleReturnOffset = runtime().getConfig().threadIsMethodHandleReturnOffset; AMD64Address dst = new AMD64Address(thread, isMethodHandleReturnOffset); masm.cmpl(dst, 0); masm.cmovq(ConditionFlag.NotEqual, rsp, rbp);
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Tue Oct 15 22:21:01 2013 +0200 @@ -368,7 +368,7 @@ } private void moveDeoptimizationActionAndReasonToThread(Value actionAndReason) { - int pendingDeoptimizationOffset = graalRuntime().getConfig().pendingDeoptimizationOffset; + int pendingDeoptimizationOffset = runtime().getConfig().pendingDeoptimizationOffset; Kind wordKind = getProviders().getCodeCache().getTarget().wordKind; RegisterValue thread = getProviders().getRegisters().getThreadRegister().asValue(wordKind); AMD64AddressValue pendingDeoptAddress = new AMD64AddressValue(actionAndReason.getKind(), thread, pendingDeoptimizationOffset);
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -35,14 +35,14 @@ private AMD64ConvertSnippets.Templates convertSnippets; - public AMD64HotSpotLoweringProvider(HotSpotGraalRuntime graalRuntime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { - super(graalRuntime, metaAccess, foreignCalls); + public AMD64HotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { + super(runtime, metaAccess, foreignCalls); } @Override public void initialize() { - HotSpotProviders providers = graalRuntime.getProviders(); - convertSnippets = new AMD64ConvertSnippets.Templates(providers, graalRuntime.getTarget()); + HotSpotProviders providers = runtime.getProviders(); + convertSnippets = new AMD64ConvertSnippets.Templates(providers, runtime.getTarget()); super.initialize(); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -50,7 +50,7 @@ } private static Register findPollOnReturnScratchRegister() { - RegisterConfig config = HotSpotGraalRuntime.graalRuntime().getProviders().getCodeCache().getRegisterConfig(); + RegisterConfig config = HotSpotGraalRuntime.runtime().getProviders().getCodeCache().getRegisterConfig(); for (Register r : config.getAllocatableRegisters(Kind.Long)) { if (r != config.getReturnRegister(Kind.Long) && r != AMD64.rbp) { return r; @@ -65,7 +65,7 @@ public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { leaveFrameAndRestoreRbp(tasm, masm); if (!isStub && (tasm.frameContext != null || !OptEliminateSafepoints.getValue())) { - AMD64HotSpotSafepointOp.emitCode(tasm, masm, graalRuntime().getConfig(), true, null, scratchForSafepointOnReturn); + AMD64HotSpotSafepointOp.emitCode(tasm, masm, runtime().getConfig(), true, null, scratchForSafepointOnReturn); } masm.ret(0); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectStaticCallOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectStaticCallOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -56,7 +56,7 @@ // instruction that loads the Klass from the inline cache. AMD64Move.move(tasm, masm, AMD64.rbx.asValue(Kind.Long), metaspaceMethod); tasm.recordMark(invokeKind == InvokeKind.Static ? Marks.MARK_INVOKESTATIC : Marks.MARK_INVOKESPECIAL); - AMD64Move.move(tasm, masm, AMD64.rax.asValue(Kind.Long), Constant.forLong(HotSpotGraalRuntime.graalRuntime().getConfig().nonOopBits)); + AMD64Move.move(tasm, masm, AMD64.rax.asValue(Kind.Long), Constant.forLong(HotSpotGraalRuntime.runtime().getConfig().nonOopBits)); super.emitCode(tasm, masm); } }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -55,7 +55,7 @@ // The mark for an invocation that uses an inline cache must be placed at the // instruction that loads the Klass from the inline cache. tasm.recordMark(invokeKind == Virtual ? Marks.MARK_INVOKEVIRTUAL : Marks.MARK_INVOKEINTERFACE); - AMD64Move.move(tasm, masm, AMD64.rax.asValue(Kind.Long), Constant.forLong(HotSpotGraalRuntime.graalRuntime().getConfig().nonOopBits)); + AMD64Move.move(tasm, masm, AMD64.rax.asValue(Kind.Long), Constant.forLong(HotSpotGraalRuntime.runtime().getConfig().nonOopBits)); super.emitCode(tasm, masm); } }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java Tue Oct 15 22:21:01 2013 +0200 @@ -57,8 +57,8 @@ acceptMethod = m; } } - HotSpotGraalRuntime graalRuntime = HotSpotGraalRuntime.graalRuntime(); - HotSpotProviders providers = graalRuntime.getProviders(); + HotSpotGraalRuntime runtime = HotSpotGraalRuntime.runtime(); + HotSpotProviders providers = runtime.getProviders(); MetaAccessProvider metaAccess = providers.getMetaAccess(); ResolvedJavaMethod method = metaAccess.lookupJavaMethod(acceptMethod); StructuredGraph graph = new StructuredGraph(method);
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILCompilationResult.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILCompilationResult.java Tue Oct 15 22:21:01 2013 +0200 @@ -73,17 +73,17 @@ consoleHandler.setLevel(logLevel); } - private static final HotSpotGraalRuntime graalRuntime = new HSAILHotSpotGraalRuntime(); + private static final HotSpotGraalRuntime runtime = new HSAILHotSpotGraalRuntime(); public static HSAILCompilationResult getHSAILCompilationResult(Method meth) { - HotSpotMetaAccessProvider metaAccess = graalRuntime.getProviders().getMetaAccess(); + HotSpotMetaAccessProvider metaAccess = runtime.getProviders().getMetaAccess(); ResolvedJavaMethod javaMethod = metaAccess.lookupJavaMethod(meth); return getHSAILCompilationResult(javaMethod); } public static HSAILCompilationResult getHSAILCompilationResult(ResolvedJavaMethod javaMethod) { - HotSpotMetaAccessProvider metaAccess = graalRuntime.getProviders().getMetaAccess(); - ForeignCallsProvider foreignCalls = graalRuntime.getProviders().getForeignCalls(); + HotSpotMetaAccessProvider metaAccess = runtime.getProviders().getMetaAccess(); + ForeignCallsProvider foreignCalls = runtime.getProviders().getForeignCalls(); StructuredGraph graph = new StructuredGraph(javaMethod); new GraphBuilderPhase(metaAccess, foreignCalls, GraphBuilderConfiguration.getEagerDefault(), OptimisticOptimizations.ALL).apply(graph); return getHSAILCompilationResult(graph); @@ -112,15 +112,15 @@ argTypes[argIndex++] = sig.getParameterType(i, null); } - RegisterConfig registerConfig = graalRuntime.getProviders().getCodeCache().getRegisterConfig(); + RegisterConfig registerConfig = runtime.getProviders().getCodeCache().getRegisterConfig(); return registerConfig.getCallingConvention(type, retType, argTypes, target, stackOnly); } public static HSAILCompilationResult getHSAILCompilationResult(StructuredGraph graph) { Debug.dump(graph, "Graph"); - Providers providers = graalRuntime.getProviders(); + Providers providers = runtime.getProviders(); TargetDescription target = providers.getCodeCache().getTarget(); - HSAILHotSpotBackend hsailBackend = (HSAILHotSpotBackend) graalRuntime.getBackend(); + HSAILHotSpotBackend hsailBackend = (HSAILHotSpotBackend) runtime.getBackend(); PhasePlan phasePlan = new PhasePlan(); GraphBuilderPhase graphBuilderPhase = new GraphBuilderPhase(providers.getMetaAccess(), providers.getForeignCalls(), GraphBuilderConfiguration.getDefault(), OptimisticOptimizations.NONE); phasePlan.addPhase(PhasePosition.AFTER_PARSING, graphBuilderPhase);
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Tue Oct 15 22:21:01 2013 +0200 @@ -50,8 +50,8 @@ private Map<String, String> paramTypeMap = new HashMap<>(); private Buffer codeBuffer; - public HSAILHotSpotBackend(HotSpotGraalRuntime graalRuntime, HotSpotProviders providers) { - super(graalRuntime, providers); + public HSAILHotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + super(runtime, providers); paramTypeMap.put("HotSpotResolvedPrimitiveType<int>", "s32"); paramTypeMap.put("HotSpotResolvedPrimitiveType<float>", "f32"); paramTypeMap.put("HotSpotResolvedPrimitiveType<double>", "f64"); @@ -74,7 +74,7 @@ @Override public LIRGenerator newLIRGenerator(StructuredGraph graph, FrameMap frameMap, CallingConvention cc, LIR lir) { - return new HSAILHotSpotLIRGenerator(graph, getProviders(), getGraalRuntime().getConfig(), frameMap, cc, lir); + return new HSAILHotSpotLIRGenerator(graph, getProviders(), getRuntime().getConfig(), frameMap, cc, lir); } public String getPartialCodeString() {
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotCodeCacheProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotCodeCacheProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -29,8 +29,8 @@ public class HSAILHotSpotCodeCacheProvider extends HotSpotCodeCacheProvider { - public HSAILHotSpotCodeCacheProvider(HotSpotGraalRuntime graalRuntime) { - super(graalRuntime); + public HSAILHotSpotCodeCacheProvider(HotSpotGraalRuntime runtime) { + super(runtime); }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotGraalRuntime.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotGraalRuntime.java Tue Oct 15 22:21:01 2013 +0200 @@ -36,7 +36,7 @@ @Override protected HotSpotProviders createProviders() { - HotSpotProviders host = HotSpotGraalRuntime.graalRuntime().getProviders(); + HotSpotProviders host = HotSpotGraalRuntime.runtime().getProviders(); HotSpotMetaAccessProvider metaAccess = host.getMetaAccess(); HSAILHotSpotCodeCacheProvider codeCache = new HSAILHotSpotCodeCacheProvider(this);
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Tue Oct 15 22:21:01 2013 +0200 @@ -37,8 +37,8 @@ */ public class PTXHotSpotBackend extends HotSpotBackend { - public PTXHotSpotBackend(HotSpotGraalRuntime graalRuntime, HotSpotProviders providers) { - super(graalRuntime, providers); + public PTXHotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + super(runtime, providers); } @Override
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotCodeCacheProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotCodeCacheProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -28,8 +28,8 @@ public class PTXHotSpotCodeCacheProvider extends HotSpotCodeCacheProvider { - public PTXHotSpotCodeCacheProvider(HotSpotGraalRuntime graalRuntime) { - super(graalRuntime); + public PTXHotSpotCodeCacheProvider(HotSpotGraalRuntime runtime) { + super(runtime); }
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotGraalRuntime.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotGraalRuntime.java Tue Oct 15 22:21:01 2013 +0200 @@ -41,17 +41,17 @@ * Called from C++ code to retrieve the singleton instance, creating it first if necessary. */ public static HotSpotGraalRuntime makeInstance() { - HotSpotGraalRuntime graalRuntime = graalRuntime(); - if (graalRuntime == null) { + HotSpotGraalRuntime runtime = runtime(); + if (runtime == null) { HotSpotGraalRuntimeFactory factory = findFactory("PTX"); if (factory != null) { - graalRuntime = factory.createRuntime(); + runtime = factory.createRuntime(); } else { - graalRuntime = new PTXHotSpotGraalRuntime(); + runtime = new PTXHotSpotGraalRuntime(); } - graalRuntime.completeInitialization(); + runtime.completeInitialization(); } - return graalRuntime; + return runtime; } @Override
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotLoweringProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotLoweringProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -32,8 +32,8 @@ public class PTXHotSpotLoweringProvider extends HotSpotLoweringProvider { - public PTXHotSpotLoweringProvider(HotSpotGraalRuntime graalRuntime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { - super(graalRuntime, metaAccess, foreignCalls); + public PTXHotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { + super(runtime, metaAccess, foreignCalls); } @Override
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/AMD64SPARCForeignCallsProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/AMD64SPARCForeignCallsProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -37,13 +37,13 @@ public class AMD64SPARCForeignCallsProvider extends HotSpotForeignCallsProvider { - public AMD64SPARCForeignCallsProvider(HotSpotGraalRuntime graalRuntime) { - super(graalRuntime); + public AMD64SPARCForeignCallsProvider(HotSpotGraalRuntime runtime) { + super(runtime); } @Override public void initialize(HotSpotProviders providers) { - Kind word = graalRuntime.getTarget().wordKind; + Kind word = runtime.getTarget().wordKind; // The calling convention for the exception handler stub is (only?) defined in // TemplateInterpreterGenerator::generate_throw_exception()
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Tue Oct 15 22:21:01 2013 +0200 @@ -55,8 +55,8 @@ private static final Unsafe unsafe = Unsafe.getUnsafe(); - public SPARCHotSpotBackend(HotSpotGraalRuntime graalRuntime, HotSpotProviders providers) { - super(graalRuntime, providers); + public SPARCHotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { + super(runtime, providers); } @Override @@ -71,7 +71,7 @@ @Override public LIRGenerator newLIRGenerator(StructuredGraph graph, FrameMap frameMap, CallingConvention cc, LIR lir) { - return new SPARCHotSpotLIRGenerator(graph, getProviders(), getGraalRuntime().getConfig(), frameMap, cc, lir); + return new SPARCHotSpotLIRGenerator(graph, getProviders(), getRuntime().getConfig(), frameMap, cc, lir); } /** @@ -176,7 +176,7 @@ SPARCMacroAssembler masm = (SPARCMacroAssembler) tasm.asm; FrameMap frameMap = tasm.frameMap; RegisterConfig regConfig = frameMap.registerConfig; - HotSpotVMConfig config = getGraalRuntime().getConfig(); + HotSpotVMConfig config = getRuntime().getConfig(); Label unverifiedStub = installedCodeOwner == null || isStatic(installedCodeOwner.getModifiers()) ? null : new Label(); // Emit the prefix
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -38,8 +38,8 @@ @Override public void emitCode(TargetMethodAssembler tasm, SPARCMacroAssembler masm) { - Register thread = graalRuntime().getProviders().getRegisters().getThreadRegister(); - HotSpotVMConfig config = graalRuntime().getConfig(); + Register thread = runtime().getProviders().getRegisters().getThreadRegister(); + HotSpotVMConfig config = runtime().getConfig(); // Restore the thread register when coming back from the runtime. new Mov(l7, thread).emit(masm);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -39,10 +39,10 @@ @Override public void emitCode(TargetMethodAssembler tasm, SPARCMacroAssembler masm) { - HotSpotRegistersProvider runtime = graalRuntime().getProviders().getRegisters(); - HotSpotVMConfig config = graalRuntime().getConfig(); - Register thread = runtime.getThreadRegister(); - Register stackPointer = runtime.getStackPointerRegister(); + HotSpotRegistersProvider registers = runtime().getProviders().getRegisters(); + HotSpotVMConfig config = runtime().getConfig(); + Register thread = registers.getThreadRegister(); + Register stackPointer = registers.getStackPointerRegister(); // Save last Java frame. new Add(stackPointer, new SPARCAddress(stackPointer, 0).getDisplacement(), g4).emit(masm);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -42,7 +42,7 @@ leaveFrame(tasm); // SPARCHotSpotBackend backend = (SPARCHotSpotBackend) -// HotSpotGraalRuntime.graalRuntime().getBackend(); +// HotSpotGraalRuntime.runtime().getBackend(); // final boolean isStub = true; // HotSpotFrameContext frameContext = backend.new HotSpotFrameContext(isStub); // frameContext.enter(tasm);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotGraalRuntime.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotGraalRuntime.java Tue Oct 15 22:21:01 2013 +0200 @@ -41,12 +41,12 @@ * Called from C++ code to retrieve the singleton instance, creating it first if necessary. */ public static HotSpotGraalRuntime makeInstance() { - HotSpotGraalRuntime graalRuntime = graalRuntime(); - if (graalRuntime == null) { - graalRuntime = new SPARCHotSpotGraalRuntime(); - graalRuntime.completeInitialization(); + HotSpotGraalRuntime runtime = runtime(); + if (runtime == null) { + runtime = new SPARCHotSpotGraalRuntime(); + runtime.completeInitialization(); } - return graalRuntime; + return runtime; } @Override
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -56,8 +56,8 @@ leaveFrame(tasm); // Restore SP from L7 if the exception PC is a method handle call site. - Register thread = graalRuntime().getProviders().getRegisters().getThreadRegister(); - int isMethodHandleReturnOffset = graalRuntime().getConfig().threadIsMethodHandleReturnOffset; + Register thread = runtime().getProviders().getRegisters().getThreadRegister(); + int isMethodHandleReturnOffset = runtime().getConfig().threadIsMethodHandleReturnOffset; SPARCAddress dst = new SPARCAddress(thread, isMethodHandleReturnOffset); new Lduw(dst, o7).emit(masm); new Cmp(o7, o7).emit(masm);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Tue Oct 15 22:21:01 2013 +0200 @@ -189,7 +189,7 @@ } private void moveDeoptimizationActionAndReasonToThread(Value actionAndReason) { - int pendingDeoptimizationOffset = graalRuntime().getConfig().pendingDeoptimizationOffset; + int pendingDeoptimizationOffset = runtime().getConfig().pendingDeoptimizationOffset; Kind wordKind = getProviders().getCodeCache().getTarget().wordKind; RegisterValue thread = getProviders().getRegisters().getThreadRegister().asValue(wordKind); SPARCAddressValue pendingDeoptAddress = new SPARCAddressValue(actionAndReason.getKind(), thread, pendingDeoptimizationOffset);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -32,8 +32,8 @@ public class SPARCHotSpotLoweringProvider extends HotSpotLoweringProvider { - public SPARCHotSpotLoweringProvider(HotSpotGraalRuntime graalRuntime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { - super(graalRuntime, metaAccess, foreignCalls); + public SPARCHotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { + super(runtime, metaAccess, foreignCalls); } @Override
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -52,7 +52,7 @@ if (!isStub && (tasm.frameContext != null || !OptEliminateSafepoints.getValue())) { // Using the same scratch register as LIR_Assembler::return_op // in c1_LIRAssembler_sparc.cpp - SPARCHotSpotSafepointOp.emitCode(tasm, masm, graalRuntime().getConfig(), true, null, SPARC.l0); + SPARCHotSpotSafepointOp.emitCode(tasm, masm, runtime().getConfig(), true, null, SPARC.l0); } ReturnOp.emitCodeHelper(tasm, masm); }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -42,7 +42,7 @@ @Opcode("CALL_DIRECT") final class SPARCHotspotDirectStaticCallOp extends DirectCallOp { - private static final long nonOopBits = HotSpotGraalRuntime.graalRuntime().getConfig().nonOopBits; + private static final long nonOopBits = HotSpotGraalRuntime.runtime().getConfig().nonOopBits; private final Constant metaspaceMethod; private final InvokeKind invokeKind;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java Tue Oct 15 22:21:01 2013 +0200 @@ -55,7 +55,7 @@ // The mark for an invocation that uses an inline cache must be placed at the // instruction that loads the Klass from the inline cache. tasm.recordMark(invokeKind == Virtual ? Marks.MARK_INVOKEVIRTUAL : Marks.MARK_INVOKEINTERFACE); - new Setx(HotSpotGraalRuntime.graalRuntime().getConfig().nonOopBits, g3, true).emit(masm); + new Setx(HotSpotGraalRuntime.runtime().getConfig().nonOopBits, g3, true).emit(masm); super.emitCode(tasm, masm); } }
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Tue Oct 15 22:21:01 2013 +0200 @@ -50,7 +50,7 @@ HotSpotResolvedJavaMethod hsMethod = (HotSpotResolvedJavaMethod) method; HotSpotNmethod installedCode = new HotSpotNmethod(hsMethod, true); HotSpotCompiledNmethod compiledNmethod = new HotSpotCompiledNmethod(hsMethod, StructuredGraph.INVOCATION_ENTRY_BCI, compResult); - CodeInstallResult result = graalRuntime().getCompilerToVM().installCode(compiledNmethod, installedCode, null); + CodeInstallResult result = runtime().getCompilerToVM().installCode(compiledNmethod, installedCode, null); Assert.assertEquals("Error installing method " + method + ": " + result, result, CodeInstallResult.OK); // HotSpotRuntime hsRuntime = (HotSpotRuntime) getCodeCache(); @@ -118,7 +118,7 @@ Assert.assertNotNull(getCode(installedCodeOwner, graph, true)); atLeastOneCompiled = true; } else { - Assert.assertFalse(graalRuntime().getConfig().useAESIntrinsics); + Assert.assertFalse(runtime().getConfig().useAESIntrinsics); } } }
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java Tue Oct 15 22:21:01 2013 +0200 @@ -629,7 +629,7 @@ int barriers = 0; // First, the total number of expected barriers is checked. - HotSpotVMConfig config = HotSpotGraalRuntime.graalRuntime().getConfig(); + HotSpotVMConfig config = HotSpotGraalRuntime.runtime().getConfig(); if (config.useG1GC) { barriers = graph.getNodes().filter(G1PreWriteBarrier.class).count() + graph.getNodes().filter(G1PostWriteBarrier.class).count() + graph.getNodes().filter(G1ArrayRangePreWriteBarrier.class).count() + graph.getNodes().filter(G1ArrayRangePostWriteBarrier.class).count();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Tue Oct 15 22:21:01 2013 +0200 @@ -58,7 +58,7 @@ Queued, Running } - private final HotSpotGraalRuntime graalRuntime; + private final HotSpotGraalRuntime runtime; private final PhasePlan plan; private final SuitesProvider suitesProvider; private final OptimisticOptimizations optimisticOpts; @@ -69,15 +69,15 @@ private StructuredGraph graph; - public static CompilationTask create(HotSpotGraalRuntime graalRuntime, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotResolvedJavaMethod method, int entryBCI, int id) { - return new CompilationTask(graalRuntime, plan, optimisticOpts, method, entryBCI, id); + public static CompilationTask create(HotSpotGraalRuntime runtime, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotResolvedJavaMethod method, int entryBCI, int id) { + return new CompilationTask(runtime, plan, optimisticOpts, method, entryBCI, id); } - private CompilationTask(HotSpotGraalRuntime graalRuntime, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotResolvedJavaMethod method, int entryBCI, int id) { + private CompilationTask(HotSpotGraalRuntime runtime, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotResolvedJavaMethod method, int entryBCI, int id) { assert id >= 0; - this.graalRuntime = graalRuntime; + this.runtime = runtime; this.plan = plan; - this.suitesProvider = graalRuntime.getCapability(SuitesProvider.class); + this.suitesProvider = runtime.getCapability(SuitesProvider.class); this.method = method; this.optimisticOpts = optimisticOpts; this.entryBCI = entryBCI; @@ -143,8 +143,8 @@ @Override public CompilationResult call() throws Exception { - graalRuntime.evictDeoptedGraphs(); - Providers providers = graalRuntime.getProviders(); + runtime.evictDeoptedGraphs(); + Providers providers = runtime.getProviders(); Replacements replacements = providers.getReplacements(); graph = replacements.getMethodSubstitution(method); if (graph == null || entryBCI != INVOCATION_ENTRY_BCI) { @@ -155,7 +155,7 @@ } InliningUtil.InlinedBytecodes.add(method.getCodeSize()); CallingConvention cc = getCallingConvention(providers.getCodeCache(), Type.JavaCallee, graph.method(), false); - return GraalCompiler.compileGraph(graph, cc, method, providers, graalRuntime.getBackend(), graalRuntime.getTarget(), graalRuntime.getCache(), plan, optimisticOpts, + return GraalCompiler.compileGraph(graph, cc, method, providers, runtime.getBackend(), runtime.getTarget(), runtime.getCache(), plan, optimisticOpts, method.getSpeculationLog(), suitesProvider.getDefaultSuites(), new CompilationResult()); } }); @@ -212,7 +212,7 @@ } private void installMethod(final CompilationResult compResult) { - final HotSpotCodeCacheProvider codeCache = graalRuntime.getProviders().getCodeCache(); + final HotSpotCodeCacheProvider codeCache = runtime.getProviders().getCodeCache(); Debug.scope("CodeInstall", new Object[]{new DebugDumpScope(String.valueOf(id), true), codeCache, method}, new Runnable() { @Override @@ -222,7 +222,7 @@ Debug.dump(new Object[]{compResult, installedCode}, "After code installation"); } if (Debug.isLogEnabled()) { - Debug.log("%s", graalRuntime.getProviders().getDisassembler().disassemble(installedCode)); + Debug.log("%s", runtime.getProviders().getDisassembler().disassemble(installedCode)); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Tue Oct 15 22:21:01 2013 +0200 @@ -51,8 +51,8 @@ public static final String SUN_BOOT_CLASS_PATH = "sun.boot.class.path"; // Some runtime instances we need. - private final HotSpotGraalRuntime graalRuntime = graalRuntime(); - private final VMToCompilerImpl vmToCompiler = (VMToCompilerImpl) graalRuntime.getVMToCompiler(); + private final HotSpotGraalRuntime runtime = runtime(); + private final VMToCompilerImpl vmToCompiler = (VMToCompilerImpl) runtime.getVMToCompiler(); /** List of Zip/Jar files to compile (see {@link GraalOptions#CompileTheWorld}. */ private final String files; @@ -182,7 +182,7 @@ } // Are we compiling this class? - HotSpotMetaAccessProvider metaAccess = graalRuntime.getProviders().getMetaAccess(); + HotSpotMetaAccessProvider metaAccess = runtime.getProviders().getMetaAccess(); if (classFileCounter >= startAt) { TTY.println("CompileTheWorld (%d) : %s", classFileCounter, className);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Tue Oct 15 22:21:01 2013 +0200 @@ -52,7 +52,7 @@ public void run() { GraalDebugConfig hotspotDebugConfig = null; if (Debug.isEnabled()) { - PrintStream log = graalRuntime().getVMToCompiler().log(); + PrintStream log = runtime().getVMToCompiler().log(); DebugEnvironment.initialize(log); } try {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Tue Oct 15 22:21:01 2013 +0200 @@ -67,15 +67,15 @@ */ public static final ForeignCallDescriptor EXCEPTION_HANDLER_IN_CALLER = new ForeignCallDescriptor("exceptionHandlerInCaller", void.class, Object.class, Word.class); - private final HotSpotGraalRuntime graalRuntime; + private final HotSpotGraalRuntime runtime; - public HotSpotBackend(HotSpotGraalRuntime graalRuntime, HotSpotProviders providers) { + public HotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) { super(providers); - this.graalRuntime = graalRuntime; + this.runtime = runtime; } - public HotSpotGraalRuntime getGraalRuntime() { - return graalRuntime; + public HotSpotGraalRuntime getRuntime() { + return runtime; } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java Tue Oct 15 22:21:01 2013 +0200 @@ -125,7 +125,7 @@ CallingConvention incomingCc = incomingCcType == null ? null : createCallingConvention(descriptor, incomingCcType); HotSpotForeignCallLinkage linkage = new HotSpotForeignCallLinkage(descriptor, address, effect, transition, outgoingCc, incomingCc, reexecutable, killedLocations); if (outgoingCcType == Type.NativeCall) { - linkage.temporaries = graalRuntime().getNativeABICallerSaveRegisters(); + linkage.temporaries = runtime().getNativeABICallerSaveRegisters(); } return linkage; } @@ -135,15 +135,15 @@ */ public static CallingConvention createCallingConvention(ForeignCallDescriptor descriptor, Type ccType) { assert ccType != null; - MetaAccessProvider metaAccess = graalRuntime().getProviders().getMetaAccess(); + MetaAccessProvider metaAccess = runtime().getProviders().getMetaAccess(); Class<?>[] argumentTypes = descriptor.getArgumentTypes(); JavaType[] parameterTypes = new JavaType[argumentTypes.length]; for (int i = 0; i < parameterTypes.length; ++i) { parameterTypes[i] = asJavaType(argumentTypes[i], metaAccess); } - TargetDescription target = graalRuntime().getTarget(); + TargetDescription target = runtime().getTarget(); JavaType returnType = asJavaType(descriptor.getResultType(), metaAccess); - RegisterConfig regConfig = graalRuntime().getProviders().getCodeCache().getRegisterConfig(); + RegisterConfig regConfig = runtime().getProviders().getCodeCache().getRegisterConfig(); return regConfig.getCallingConvention(ccType, returnType, parameterTypes, target, false); } @@ -206,7 +206,7 @@ } public long getMaxCallTargetOffset() { - return graalRuntime().getCompilerToVM().getMaxCallTargetOffset(address); + return runtime().getCompilerToVM().getMaxCallTargetOffset(address); } public ForeignCallDescriptor getDescriptor() {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Tue Oct 15 22:21:01 2013 +0200 @@ -43,8 +43,6 @@ import com.oracle.graal.phases.*; import com.oracle.graal.phases.tiers.*; -//import static com.oracle.graal.phases.GraalOptions.*; - /** * Singleton class holding the instance of the {@link GraalRuntime}. * @@ -57,7 +55,7 @@ /** * Gets the singleton {@link HotSpotGraalRuntime} object. */ - public static HotSpotGraalRuntime graalRuntime() { + public static HotSpotGraalRuntime runtime() { return instance; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Tue Oct 15 22:21:01 2013 +0200 @@ -81,7 +81,7 @@ //@formatter:on - private final HotSpotGraalRuntime graalRuntime; + private final HotSpotGraalRuntime runtime; public final HotSpotResolvedPrimitiveType typeBoolean; public final HotSpotResolvedPrimitiveType typeChar; @@ -102,8 +102,8 @@ private long compilerStartTime; - public VMToCompilerImpl(HotSpotGraalRuntime compiler) { - this.graalRuntime = compiler; + public VMToCompilerImpl(HotSpotGraalRuntime runtime) { + this.runtime = runtime; typeBoolean = new HotSpotResolvedPrimitiveType(Kind.Boolean); typeChar = new HotSpotResolvedPrimitiveType(Kind.Char); @@ -128,7 +128,7 @@ bootstrapRunning = bootstrapEnabled; - HotSpotVMConfig config = graalRuntime.getConfig(); + HotSpotVMConfig config = runtime.getConfig(); long offset = config.graalMirrorInClassOffset; initMirror(typeBoolean, offset); initMirror(typeChar, offset); @@ -180,7 +180,7 @@ } } - final HotSpotProviders providers = graalRuntime.getProviders(); + final HotSpotProviders providers = runtime.getProviders(); final MetaAccessProvider metaAccess = providers.getMetaAccess(); assert VerifyOptionsPhase.checkOptions(metaAccess, providers.getForeignCalls()); @@ -233,7 +233,7 @@ t.start(); } - BenchmarkCounters.initialize(graalRuntime.getCompilerToVM()); + BenchmarkCounters.initialize(runtime.getCompilerToVM()); compilerStartTime = System.nanoTime(); } @@ -270,7 +270,7 @@ */ protected void phaseTransition(String phase) { CompilationStatistics.clear(phase); - if (graalRuntime.getConfig().ciTime) { + if (runtime.getConfig().ciTime) { parsedBytecodesPerSecond = MetricRateInPhase.snapshot(phase, parsedBytecodesPerSecond, BytecodesParsed, CompilationTime, TimeUnit.SECONDS); inlinedBytecodesPerSecond = MetricRateInPhase.snapshot(phase, inlinedBytecodesPerSecond, InlinedBytecodes, CompilationTime, TimeUnit.SECONDS); } @@ -334,8 +334,8 @@ bootstrapRunning = false; TTY.println(" in %d ms (compiled %d methods)", System.currentTimeMillis() - startTime, compileQueue.getCompletedTaskCount()); - if (graalRuntime.getCache() != null) { - graalRuntime.getCache().clear(); + if (runtime.getCache() != null) { + runtime.getCache().clear(); } System.gc(); phaseTransition("bootstrap2"); @@ -350,7 +350,7 @@ private MetricRateInPhase inlinedBytecodesPerSecond; private void enqueue(Method m) throws Throwable { - JavaMethod javaMethod = graalRuntime.getProviders().getMetaAccess().lookupJavaMethod(m); + JavaMethod javaMethod = runtime.getProviders().getMetaAccess().lookupJavaMethod(m); assert !Modifier.isAbstract(((HotSpotResolvedJavaMethod) javaMethod).getModifiers()) && !Modifier.isNative(((HotSpotResolvedJavaMethod) javaMethod).getModifiers()) : javaMethod; compileMethod((HotSpotResolvedJavaMethod) javaMethod, StructuredGraph.INVOCATION_ENTRY_BCI, false); } @@ -423,13 +423,13 @@ } phaseTransition("final"); - if (graalRuntime.getConfig().ciTime) { + if (runtime.getConfig().ciTime) { parsedBytecodesPerSecond.printAll("ParsedBytecodesPerSecond", System.out); inlinedBytecodesPerSecond.printAll("InlinedBytecodesPerSecond", System.out); } SnippetCounter.printGroups(TTY.out().out()); - BenchmarkCounters.shutdown(graalRuntime.getCompilerToVM(), compilerStartTime); + BenchmarkCounters.shutdown(runtime.getCompilerToVM(), compilerStartTime); } private void flattenChildren(DebugValueMap map, DebugValueMap globalMap) { @@ -557,7 +557,7 @@ final OptimisticOptimizations optimisticOpts = new OptimisticOptimizations(method); int id = compileTaskIds.incrementAndGet(); - CompilationTask task = CompilationTask.create(graalRuntime, createPhasePlan(optimisticOpts, osrCompilation), optimisticOpts, method, entryBCI, id); + CompilationTask task = CompilationTask.create(runtime, createPhasePlan(optimisticOpts, osrCompilation), optimisticOpts, method, entryBCI, id); if (blocking) { task.runCompilation(); @@ -643,7 +643,7 @@ public HotSpotResolvedObjectType createResolvedJavaType(long metaspaceKlass, String name, String simpleName, Class javaMirror, int sizeOrSpecies) { HotSpotResolvedObjectType type = new HotSpotResolvedObjectType(metaspaceKlass, name, simpleName, javaMirror, sizeOrSpecies); - long offset = graalRuntime().getConfig().graalMirrorInClassOffset; + long offset = runtime().getConfig().graalMirrorInClassOffset; if (!unsafe.compareAndSwapObject(javaMirror, offset, null, type)) { // lost the race - return the existing value instead type = (HotSpotResolvedObjectType) unsafe.getObject(javaMirror, offset); @@ -692,8 +692,8 @@ public PhasePlan createPhasePlan(OptimisticOptimizations optimisticOpts, boolean onStackReplacement) { PhasePlan phasePlan = new PhasePlan(); - MetaAccessProvider metaAccess = graalRuntime.getProviders().getMetaAccess(); - ForeignCallsProvider foreignCalls = graalRuntime.getProviders().getForeignCalls(); + MetaAccessProvider metaAccess = runtime.getProviders().getMetaAccess(); + ForeignCallsProvider foreignCalls = runtime.getProviders().getForeignCalls(); phasePlan.addPhase(PhasePosition.AFTER_PARSING, new GraphBuilderPhase(metaAccess, foreignCalls, GraphBuilderConfiguration.getDefault(), optimisticOpts)); if (onStackReplacement) { phasePlan.addPhase(PhasePosition.AFTER_PARSING, new OnStackReplacementPhase());
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LocalImpl.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LocalImpl.java Tue Oct 15 22:21:01 2013 +0200 @@ -40,9 +40,9 @@ this.bciStart = bciStart; this.bciEnd = bciEnd; this.slot = slot; - JavaType t = graalRuntime().lookupType(type, holder, true); + JavaType t = runtime().lookupType(type, holder, true); if (t instanceof ResolvedJavaType) { - this.resolvedType = (ResolvedJavaType) graalRuntime().lookupType(type, holder, false); + this.resolvedType = (ResolvedJavaType) runtime().lookupType(type, holder, false); } else { throw new AssertionError(t.getClass() + " is not a ResolvedJavaType"); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -43,11 +43,11 @@ */ public abstract class HotSpotCodeCacheProvider implements CodeCacheProvider { - protected final HotSpotGraalRuntime graalRuntime; + protected final HotSpotGraalRuntime runtime; protected final RegisterConfig regConfig; - public HotSpotCodeCacheProvider(HotSpotGraalRuntime graalRuntime) { - this.graalRuntime = graalRuntime; + public HotSpotCodeCacheProvider(HotSpotGraalRuntime runtime) { + this.runtime = runtime; regConfig = createRegisterConfig(); } @@ -57,7 +57,7 @@ public String disassemble(CompilationResult compResult, InstalledCode installedCode) { byte[] code = installedCode == null ? Arrays.copyOf(compResult.getTargetCode(), compResult.getTargetCodeSize()) : installedCode.getCode(); long start = installedCode == null ? 0L : installedCode.getStart(); - TargetDescription target = graalRuntime.getTarget(); + TargetDescription target = runtime.getTarget(); HexCodeFile hcf = new HexCodeFile(code, start, target.arch.getName(), target.wordSize * 8); if (compResult != null) { HexCodeFile.addAnnotations(hcf, compResult.getAnnotations()); @@ -92,12 +92,12 @@ * Decodes a call target to a mnemonic if possible. */ private String getTargetName(Call call) { - Field[] fields = graalRuntime.getConfig().getClass().getDeclaredFields(); + Field[] fields = runtime.getConfig().getClass().getDeclaredFields(); for (Field f : fields) { if (f.getName().endsWith("Stub")) { f.setAccessible(true); try { - Object address = f.get(graalRuntime.getConfig()); + Object address = f.get(runtime.getConfig()); if (address.equals(call.target)) { return f.getName() + ":0x" + Long.toHexString((Long) address); } @@ -152,12 +152,12 @@ @Override public int getMinimumOutgoingSize() { - return graalRuntime.getConfig().runtimeCallStackSize; + return runtime.getConfig().runtimeCallStackSize; } public HotSpotInstalledCode installMethod(HotSpotResolvedJavaMethod method, int entryBCI, CompilationResult compResult) { HotSpotInstalledCode installedCode = new HotSpotNmethod(method, true); - graalRuntime.getCompilerToVM().installCode(new HotSpotCompiledNmethod(method, entryBCI, compResult), installedCode, method.getSpeculationLog()); + runtime.getCompilerToVM().installCode(new HotSpotCompiledNmethod(method, entryBCI, compResult), installedCode, method.getSpeculationLog()); return installedCode; } @@ -165,7 +165,7 @@ public InstalledCode addMethod(ResolvedJavaMethod method, CompilationResult compResult) { HotSpotResolvedJavaMethod hotspotMethod = (HotSpotResolvedJavaMethod) method; HotSpotInstalledCode code = new HotSpotNmethod(hotspotMethod, false); - CodeInstallResult result = graalRuntime.getCompilerToVM().installCode(new HotSpotCompiledNmethod(hotspotMethod, -1, compResult), code, null); + CodeInstallResult result = runtime.getCompilerToVM().installCode(new HotSpotCompiledNmethod(hotspotMethod, -1, compResult), code, null); if (result != CodeInstallResult.OK) { return null; } @@ -177,7 +177,7 @@ HotSpotResolvedJavaMethod javaMethod = (HotSpotResolvedJavaMethod) method; HotSpotInstalledCode icode = new HotSpotNmethod(javaMethod, false, true); HotSpotCompiledNmethod compiled = new HotSpotCompiledNmethod(javaMethod, -1, compResult); - CompilerToVM vm = graalRuntime.getCompilerToVM(); + CompilerToVM vm = runtime.getCompilerToVM(); CodeInstallResult result = vm.installCode(compiled, icode, null); if (result != CodeInstallResult.OK) { return null; @@ -191,13 +191,13 @@ @Override public TargetDescription getTarget() { - return graalRuntime.getTarget(); + return runtime.getTarget(); } public String disassemble(InstalledCode code) { if (code.isValid()) { long codeBlob = ((HotSpotInstalledCode) code).getCodeBlob(); - return graalRuntime.getCompilerToVM().disassembleCodeBlob(codeBlob); + return runtime.getCompilerToVM().disassembleCodeBlob(codeBlob); } return null; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Tue Oct 15 22:21:01 2013 +0200 @@ -43,13 +43,13 @@ @Override public int length() { - return graalRuntime().getCompilerToVM().constantPoolLength(type); + return runtime().getCompilerToVM().constantPoolLength(type); } @Override public Object lookupConstant(int cpi) { assert cpi != 0; - Object constant = graalRuntime().getCompilerToVM().lookupConstantInPool(type, cpi); + Object constant = runtime().getCompilerToVM().lookupConstantInPool(type, cpi); return constant; } @@ -61,26 +61,26 @@ @Override public Object lookupAppendix(int cpi, int opcode) { assert Bytecodes.isInvoke(opcode); - return graalRuntime().getCompilerToVM().lookupAppendixInPool(type, cpi, (byte) opcode); + return runtime().getCompilerToVM().lookupAppendixInPool(type, cpi, (byte) opcode); } @Override public JavaMethod lookupMethod(int cpi, int opcode) { - return graalRuntime().getCompilerToVM().lookupMethodInPool(type, cpi, (byte) opcode); + return runtime().getCompilerToVM().lookupMethodInPool(type, cpi, (byte) opcode); } @Override public JavaType lookupType(int cpi, int opcode) { - return graalRuntime().getCompilerToVM().lookupTypeInPool(type, cpi); + return runtime().getCompilerToVM().lookupTypeInPool(type, cpi); } @Override public JavaField lookupField(int cpi, int opcode) { - return graalRuntime().getCompilerToVM().lookupFieldInPool(type, cpi, (byte) opcode); + return runtime().getCompilerToVM().lookupFieldInPool(type, cpi, (byte) opcode); } @Override public void loadReferencedType(int cpi, int opcode) { - graalRuntime().getCompilerToVM().lookupReferencedTypeInPool(type, cpi, (byte) opcode); + runtime().getCompilerToVM().lookupReferencedTypeInPool(type, cpi, (byte) opcode); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -36,10 +36,10 @@ */ public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider { - protected final HotSpotGraalRuntime graalRuntime; + protected final HotSpotGraalRuntime runtime; - public HotSpotConstantReflectionProvider(HotSpotGraalRuntime graalRuntime) { - this.graalRuntime = graalRuntime; + public HotSpotConstantReflectionProvider(HotSpotGraalRuntime runtime) { + this.runtime = runtime; } @Override @@ -69,11 +69,11 @@ case Int: return Constant.forInt(base == null ? unsafe.getInt(displacement) : unsafe.getInt(base, displacement)); case Long: - if (displacement == config().hubOffset && graalRuntime.getConfig().useCompressedClassPointers) { + if (displacement == config().hubOffset && runtime.getConfig().useCompressedClassPointers) { if (base == null) { throw new GraalInternalError("Base of object must not be null"); } else { - return Constant.forLong(graalRuntime.getCompilerToVM().readUnsafeKlassPointer(base)); + return Constant.forLong(runtime.getCompilerToVM().readUnsafeKlassPointer(base)); } } else { return Constant.forLong(base == null ? unsafe.getLong(displacement) : unsafe.getLong(base, displacement)); @@ -87,7 +87,7 @@ if (compressible) { o = unsafe.getObject(base, displacement); } else { - o = graalRuntime.getCompilerToVM().readUnsafeUncompressedPointer(base, displacement); + o = runtime.getCompilerToVM().readUnsafeUncompressedPointer(base, displacement); } return Constant.forObject(o); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotDisassemblerProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotDisassemblerProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -30,16 +30,16 @@ */ public class HotSpotDisassemblerProvider implements DisassemblerProvider { - protected final HotSpotGraalRuntime graalRuntime; + protected final HotSpotGraalRuntime runtime; - public HotSpotDisassemblerProvider(HotSpotGraalRuntime graalRuntime) { - this.graalRuntime = graalRuntime; + public HotSpotDisassemblerProvider(HotSpotGraalRuntime runtime) { + this.runtime = runtime; } public String disassemble(InstalledCode code) { if (code.isValid()) { long codeBlob = ((HotSpotInstalledCode) code).getCodeBlob(); - return graalRuntime.getCompilerToVM().disassembleCodeBlob(codeBlob); + return runtime.getCompilerToVM().disassembleCodeBlob(codeBlob); } return null; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -68,12 +68,12 @@ public static final ForeignCallDescriptor VERIFY_OOP = new ForeignCallDescriptor("verify_oop", Object.class, Object.class); public static final ForeignCallDescriptor LOAD_AND_CLEAR_EXCEPTION = new ForeignCallDescriptor("load_and_clear_exception", Object.class, Word.class); - protected final HotSpotGraalRuntime graalRuntime; + protected final HotSpotGraalRuntime runtime; private final Map<ForeignCallDescriptor, HotSpotForeignCallLinkage> foreignCalls = new HashMap<>(); - public HotSpotForeignCallsProvider(HotSpotGraalRuntime graalRuntime) { - this.graalRuntime = graalRuntime; + public HotSpotForeignCallsProvider(HotSpotGraalRuntime runtime) { + this.runtime = runtime; } /** @@ -156,7 +156,7 @@ public static final LocationIdentity[] NO_LOCATIONS = {}; public void initialize(HotSpotProviders providers) { - HotSpotVMConfig c = graalRuntime.getConfig(); + HotSpotVMConfig c = runtime.getConfig(); TargetDescription target = providers.getCodeCache().getTarget(); registerForeignCall(UNCOMMON_TRAP, c.uncommonTrapStub, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS); @@ -204,7 +204,7 @@ public HotSpotForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) { HotSpotForeignCallLinkage callTarget = foreignCalls.get(descriptor); assert foreignCalls != null : descriptor; - callTarget.finalizeAddress(graalRuntime.getBackend()); + callTarget.finalizeAddress(runtime.getBackend()); return callTarget; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -59,7 +59,7 @@ */ public class HotSpotLoweringProvider implements LoweringProvider { - protected final HotSpotGraalRuntime graalRuntime; + protected final HotSpotGraalRuntime runtime; protected final MetaAccessProvider metaAccess; protected final ForeignCallsProvider foreignCalls; @@ -72,15 +72,15 @@ private LoadExceptionObjectSnippets.Templates exceptionObjectSnippets; private UnsafeLoadSnippets.Templates unsafeLoadSnippets; - public HotSpotLoweringProvider(HotSpotGraalRuntime graalRuntime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { - this.graalRuntime = graalRuntime; + public HotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { + this.runtime = runtime; this.metaAccess = metaAccess; this.foreignCalls = foreignCalls; } public void initialize() { - HotSpotVMConfig c = graalRuntime.getConfig(); - HotSpotProviders providers = graalRuntime.getProviders(); + HotSpotVMConfig c = runtime.getConfig(); + HotSpotProviders providers = runtime.getProviders(); Replacements r = providers.getReplacements(); r.registerSubstitutions(ObjectSubstitutions.class); @@ -93,24 +93,24 @@ r.registerSubstitutions(CRC32Substitutions.class); r.registerSubstitutions(ReflectionSubstitutions.class); - checkcastDynamicSnippets = new CheckCastDynamicSnippets.Templates(providers, graalRuntime.getTarget()); - instanceofSnippets = new InstanceOfSnippets.Templates(providers, graalRuntime.getTarget()); - newObjectSnippets = new NewObjectSnippets.Templates(providers, graalRuntime.getTarget()); - monitorSnippets = new MonitorSnippets.Templates(providers, graalRuntime.getTarget(), c.useFastLocking); - writeBarrierSnippets = new WriteBarrierSnippets.Templates(providers, graalRuntime.getTarget()); - boxingSnippets = new BoxingSnippets.Templates(providers, graalRuntime.getTarget()); - exceptionObjectSnippets = new LoadExceptionObjectSnippets.Templates(providers, graalRuntime.getTarget()); - unsafeLoadSnippets = new UnsafeLoadSnippets.Templates(providers, graalRuntime.getTarget()); + checkcastDynamicSnippets = new CheckCastDynamicSnippets.Templates(providers, runtime.getTarget()); + instanceofSnippets = new InstanceOfSnippets.Templates(providers, runtime.getTarget()); + newObjectSnippets = new NewObjectSnippets.Templates(providers, runtime.getTarget()); + monitorSnippets = new MonitorSnippets.Templates(providers, runtime.getTarget(), c.useFastLocking); + writeBarrierSnippets = new WriteBarrierSnippets.Templates(providers, runtime.getTarget()); + boxingSnippets = new BoxingSnippets.Templates(providers, runtime.getTarget()); + exceptionObjectSnippets = new LoadExceptionObjectSnippets.Templates(providers, runtime.getTarget()); + unsafeLoadSnippets = new UnsafeLoadSnippets.Templates(providers, runtime.getTarget()); - r.registerSnippetTemplateCache(new UnsafeArrayCopySnippets.Templates(providers, graalRuntime.getTarget())); + r.registerSnippetTemplateCache(new UnsafeArrayCopySnippets.Templates(providers, runtime.getTarget())); } @Override public void lower(Node n, LoweringTool tool) { - HotSpotVMConfig config = graalRuntime.getConfig(); + HotSpotVMConfig config = runtime.getConfig(); StructuredGraph graph = (StructuredGraph) n.graph(); - Kind wordKind = graalRuntime.getTarget().wordKind; + Kind wordKind = runtime.getTarget().wordKind; if (n instanceof ArrayLengthNode) { ArrayLengthNode arrayLengthNode = (ArrayLengthNode) n; ValueNode array = arrayLengthNode.array(); @@ -413,7 +413,7 @@ } } else if (n instanceof DynamicCounterNode) { if (graph.getGuardsStage() == StructuredGraph.GuardsStage.AFTER_FSA) { - BenchmarkCounters.lower((DynamicCounterNode) n, graalRuntime.getProviders().getRegisters(), graalRuntime.getConfig(), wordKind); + BenchmarkCounters.lower((DynamicCounterNode) n, runtime.getProviders().getRegisters(), runtime.getConfig(), wordKind); } } else if (n instanceof CheckCastDynamicNode) { checkcastDynamicSnippets.lower((CheckCastDynamicNode) n); @@ -540,14 +540,14 @@ } private FloatingReadNode createReadHub(StructuredGraph graph, Kind wordKind, ValueNode object, GuardingNode guard) { - HotSpotVMConfig config = graalRuntime.getConfig(); + HotSpotVMConfig config = runtime.getConfig(); LocationNode location = ConstantLocationNode.create(FINAL_LOCATION, wordKind, config.hubOffset, graph); assert !object.isConstant() || object.asConstant().isNull(); return graph.unique(new FloatingReadNode(object, location, null, StampFactory.forKind(wordKind), guard, BarrierType.NONE, config.useCompressedClassPointers)); } private WriteNode createWriteHub(StructuredGraph graph, Kind wordKind, ValueNode object, ValueNode value) { - HotSpotVMConfig config = graalRuntime.getConfig(); + HotSpotVMConfig config = runtime.getConfig(); LocationNode location = ConstantLocationNode.create(HUB_LOCATION, wordKind, config.hubOffset, graph); assert !object.isConstant() || object.asConstant().isNull(); return graph.add(new WriteNode(object, value, location, BarrierType.NONE, config.useCompressedClassPointers)); @@ -614,9 +614,9 @@ public int getScalingFactor(Kind kind) { if (useCompressedOops() && kind == Kind.Object) { - return this.graalRuntime.getTarget().arch.getSizeInBytes(Kind.Int); + return this.runtime.getTarget().arch.getSizeInBytes(Kind.Int); } else { - return this.graalRuntime.getTarget().arch.getSizeInBytes(kind); + return this.runtime.getTarget().arch.getSizeInBytes(kind); } } @@ -670,7 +670,7 @@ ValueNode arrayLength = readArrayLength(array, tool.getConstantReflection()); if (arrayLength == null) { Stamp stamp = StampFactory.positiveInt(); - ReadNode readArrayLength = g.add(new ReadNode(array, ConstantLocationNode.create(FINAL_LOCATION, Kind.Int, graalRuntime.getConfig().arrayLengthOffset, g), stamp, BarrierType.NONE, false)); + ReadNode readArrayLength = g.add(new ReadNode(array, ConstantLocationNode.create(FINAL_LOCATION, Kind.Int, runtime.getConfig().arrayLengthOffset, g), stamp, BarrierType.NONE, false)); g.addBeforeFixed(n, readArrayLength); tool.createNullCheckGuard(readArrayLength, array); arrayLength = readArrayLength;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -34,10 +34,10 @@ */ public class HotSpotMetaAccessProvider implements MetaAccessProvider { - protected final HotSpotGraalRuntime graalRuntime; + protected final HotSpotGraalRuntime runtime; - public HotSpotMetaAccessProvider(HotSpotGraalRuntime graalRuntime) { - this.graalRuntime = graalRuntime; + public HotSpotMetaAccessProvider(HotSpotGraalRuntime runtime) { + this.runtime = runtime; } public ResolvedJavaType lookupJavaType(Class<?> clazz) { @@ -60,7 +60,7 @@ } public ResolvedJavaMethod lookupJavaMethod(Method reflectionMethod) { - CompilerToVM c2vm = graalRuntime.getCompilerToVM(); + CompilerToVM c2vm = runtime.getCompilerToVM(); HotSpotResolvedObjectType[] resultHolder = {null}; long metaspaceMethod = c2vm.getMetaspaceMethod(reflectionMethod, resultHolder); assert metaspaceMethod != 0L; @@ -68,7 +68,7 @@ } public ResolvedJavaMethod lookupJavaConstructor(Constructor reflectionConstructor) { - CompilerToVM c2vm = graalRuntime.getCompilerToVM(); + CompilerToVM c2vm = runtime.getCompilerToVM(); HotSpotResolvedObjectType[] resultHolder = {null}; long metaspaceMethod = c2vm.getMetaspaceConstructor(reflectionConstructor, resultHolder); assert metaspaceMethod != 0L; @@ -76,7 +76,7 @@ } public ResolvedJavaField lookupJavaField(Field reflectionField) { - return graalRuntime.getCompilerToVM().getJavaField(reflectionField); + return runtime.getCompilerToVM().getJavaField(reflectionField); } @Override @@ -92,15 +92,15 @@ public int convertDeoptAction(DeoptimizationAction action) { switch (action) { case None: - return graalRuntime.getConfig().deoptActionNone; + return runtime.getConfig().deoptActionNone; case RecompileIfTooManyDeopts: - return graalRuntime.getConfig().deoptActionMaybeRecompile; + return runtime.getConfig().deoptActionMaybeRecompile; case InvalidateReprofile: - return graalRuntime.getConfig().deoptActionReinterpret; + return runtime.getConfig().deoptActionReinterpret; case InvalidateRecompile: - return graalRuntime.getConfig().deoptActionMakeNotEntrant; + return runtime.getConfig().deoptActionMakeNotEntrant; case InvalidateStopCompiling: - return graalRuntime.getConfig().deoptActionMakeNotCompilable; + return runtime.getConfig().deoptActionMakeNotCompilable; default: throw GraalInternalError.shouldNotReachHere(); } @@ -109,33 +109,33 @@ public int convertDeoptReason(DeoptimizationReason reason) { switch (reason) { case None: - return graalRuntime.getConfig().deoptReasonNone; + return runtime.getConfig().deoptReasonNone; case NullCheckException: - return graalRuntime.getConfig().deoptReasonNullCheck; + return runtime.getConfig().deoptReasonNullCheck; case BoundsCheckException: - return graalRuntime.getConfig().deoptReasonRangeCheck; + return runtime.getConfig().deoptReasonRangeCheck; case ClassCastException: - return graalRuntime.getConfig().deoptReasonClassCheck; + return runtime.getConfig().deoptReasonClassCheck; case ArrayStoreException: - return graalRuntime.getConfig().deoptReasonArrayCheck; + return runtime.getConfig().deoptReasonArrayCheck; case UnreachedCode: - return graalRuntime.getConfig().deoptReasonUnreached0; + return runtime.getConfig().deoptReasonUnreached0; case TypeCheckedInliningViolated: - return graalRuntime.getConfig().deoptReasonTypeCheckInlining; + return runtime.getConfig().deoptReasonTypeCheckInlining; case OptimizedTypeCheckViolated: - return graalRuntime.getConfig().deoptReasonOptimizedTypeCheck; + return runtime.getConfig().deoptReasonOptimizedTypeCheck; case NotCompiledExceptionHandler: - return graalRuntime.getConfig().deoptReasonNotCompiledExceptionHandler; + return runtime.getConfig().deoptReasonNotCompiledExceptionHandler; case Unresolved: - return graalRuntime.getConfig().deoptReasonUnresolved; + return runtime.getConfig().deoptReasonUnresolved; case JavaSubroutineMismatch: - return graalRuntime.getConfig().deoptReasonJsrMismatch; + return runtime.getConfig().deoptReasonJsrMismatch; case ArithmeticException: - return graalRuntime.getConfig().deoptReasonDiv0Check; + return runtime.getConfig().deoptReasonDiv0Check; case RuntimeConstraint: - return graalRuntime.getConfig().deoptReasonConstraint; + return runtime.getConfig().deoptReasonConstraint; case LoopLimitCheck: - return graalRuntime.getConfig().deoptReasonLoopLimitCheck; + return runtime.getConfig().deoptReasonLoopLimitCheck; default: throw GraalInternalError.shouldNotReachHere(); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Tue Oct 15 22:21:01 2013 +0200 @@ -40,7 +40,7 @@ private static final long serialVersionUID = -8873133496591225071L; - private static final HotSpotVMConfig config = graalRuntime().getConfig(); + private static final HotSpotVMConfig config = runtime().getConfig(); private static final HotSpotMethodDataAccessor NO_DATA_NO_EXCEPTION_ACCESSOR = new NoMethodData(TriState.FALSE); private static final HotSpotMethodDataAccessor NO_DATA_EXCEPTION_POSSIBLY_NOT_RECORDED_ACCESSOR = new NoMethodData(TriState.UNKNOWN); @@ -58,7 +58,7 @@ HotSpotMethodData(long metaspaceMethodData) { this.metaspaceMethodData = metaspaceMethodData; - graalRuntime().getCompilerToVM().initializeMethodData(metaspaceMethodData, this); + runtime().getCompilerToVM().initializeMethodData(metaspaceMethodData, this); } public boolean hasNormalData() { @@ -78,7 +78,7 @@ } public int getDeoptimizationCount(DeoptimizationReason reason) { - int reasonIndex = graalRuntime().getProviders().getMetaAccess().convertDeoptReason(reason); + int reasonIndex = runtime().getProviders().getMetaAccess().convertDeoptReason(reason); return unsafe.getByte(metaspaceMethodData + config.methodDataOopTrapHistoryOffset + reasonIndex) & 0xFF; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNmethod.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNmethod.java Tue Oct 15 22:21:01 2013 +0200 @@ -79,7 +79,7 @@ @Override public void invalidate() { - graalRuntime().getCompilerToVM().invalidateInstalledCode(this); + runtime().getCompilerToVM().invalidateInstalledCode(this); } @Override @@ -120,7 +120,7 @@ assert isExternal(); // for now - return graalRuntime().getCompilerToGPU().executeParallelMethodVarargs(dimX, dimY, dimZ, args, this); + return runtime().getCompilerToGPU().executeParallelMethodVarargs(dimX, dimY, dimZ, args, this); } @@ -128,9 +128,9 @@ public Object executeVarargs(Object... args) throws InvalidInstalledCodeException { assert checkArgs(args); if (isExternal()) { - return graalRuntime().getCompilerToGPU().executeExternalMethodVarargs(args, this); + return runtime().getCompilerToGPU().executeExternalMethodVarargs(args, this); } else { - return graalRuntime().getCompilerToVM().executeCompiledMethodVarargs(args, this); + return runtime().getCompilerToVM().executeCompiledMethodVarargs(args, this); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java Tue Oct 15 22:21:01 2013 +0200 @@ -92,7 +92,7 @@ * only called for snippets or replacements. */ private static boolean isCalledForSnippets() { - MetaAccessProvider metaAccess = graalRuntime().getProviders().getMetaAccess(); + MetaAccessProvider metaAccess = runtime().getProviders().getMetaAccess(); ResolvedJavaMethod makeGraphMethod = null; ResolvedJavaMethod initMethod = null; try { @@ -119,7 +119,7 @@ private static final Set<ResolvedJavaField> notEmbeddable = new HashSet<>(); private static void addResolvedToSet(Field field) { - MetaAccessProvider metaAccess = graalRuntime().getProviders().getMetaAccess(); + MetaAccessProvider metaAccess = runtime().getProviders().getMetaAccess(); notEmbeddable.add(metaAccess.lookupJavaField(field)); } @@ -216,12 +216,12 @@ if (receiver == null) { assert Modifier.isStatic(flags); if (holder.isInitialized()) { - return graalRuntime().getProviders().getConstantReflection().readUnsafeConstant(getKind(), holder.mirror(), offset, getKind() == Kind.Object); + return runtime().getProviders().getConstantReflection().readUnsafeConstant(getKind(), holder.mirror(), offset, getKind() == Kind.Object); } return null; } else { assert !Modifier.isStatic(flags); - return graalRuntime().getProviders().getConstantReflection().readUnsafeConstant(getKind(), receiver.asObject(), offset, getKind() == Kind.Object); + return runtime().getProviders().getConstantReflection().readUnsafeConstant(getKind(), receiver.asObject(), offset, getKind() == Kind.Object); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java Tue Oct 15 22:21:01 2013 +0200 @@ -73,7 +73,7 @@ * {@code metaspaceMethod} */ public static HotSpotResolvedObjectType getHolder(long metaspaceMethod) { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); long constMethod = unsafe.getLong(metaspaceMethod + config.methodConstMethodOffset); assert constMethod != 0; long constantPool = unsafe.getLong(constMethod + config.constMethodConstantsOffset); @@ -97,7 +97,7 @@ HotSpotResolvedJavaMethod(HotSpotResolvedObjectType holder, long metaspaceMethod) { this.metaspaceMethod = metaspaceMethod; this.holder = holder; - graalRuntime().getCompilerToVM().initializeMethod(metaspaceMethod, this); + runtime().getCompilerToVM().initializeMethod(metaspaceMethod, this); } @Override @@ -113,7 +113,7 @@ * Gets the address of the C++ Method object for this method. */ public Constant getMetaspaceMethodConstant() { - return Constant.forIntegerKind(graalRuntime().getTarget().wordKind, metaspaceMethod, this); + return Constant.forIntegerKind(runtime().getTarget().wordKind, metaspaceMethod, this); } @Override @@ -123,7 +123,7 @@ @Override public int getModifiers() { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); return unsafe.getInt(metaspaceMethod + config.methodAccessFlagsOffset) & Modifier.methodModifiers(); } @@ -138,8 +138,8 @@ if (codeSize == 0) { return null; } - if (code == null && graalRuntime().getCompilerToVM().isTypeLinked(holder)) { - code = graalRuntime().getCompilerToVM().initializeBytecode(metaspaceMethod, new byte[codeSize]); + if (code == null && runtime().getCompilerToVM().isTypeLinked(holder)) { + code = runtime().getCompilerToVM().initializeBytecode(metaspaceMethod, new byte[codeSize]); assert code.length == codeSize : "expected: " + codeSize + ", actual: " + code.length; } return code; @@ -159,7 +159,7 @@ for (int i = 0; i < exceptionHandlerCount; i++) { handlers[i] = new ExceptionHandler(-1, -1, -1, -1, null); } - return graalRuntime().getCompilerToVM().initializeExceptionHandlers(metaspaceMethod, handlers); + return runtime().getCompilerToVM().initializeExceptionHandlers(metaspaceMethod, handlers); } /** @@ -201,7 +201,7 @@ public boolean hasBalancedMonitors() { if (hasBalancedMonitors == null) { - hasBalancedMonitors = graalRuntime().getCompilerToVM().hasBalancedMonitors(metaspaceMethod); + hasBalancedMonitors = runtime().getCompilerToVM().hasBalancedMonitors(metaspaceMethod); } return hasBalancedMonitors; } @@ -222,7 +222,7 @@ if (Modifier.isAbstract(modifiers) || Modifier.isNative(modifiers)) { return 0; } - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); long metaspaceConstMethod = unsafe.getLong(metaspaceMethod + config.methodConstMethodOffset); return unsafe.getShort(metaspaceConstMethod + config.methodMaxLocalsOffset) & 0xFFFF; } @@ -233,7 +233,7 @@ if (Modifier.isAbstract(modifiers) || Modifier.isNative(modifiers)) { return 0; } - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); long metaspaceConstMethod = unsafe.getLong(metaspaceMethod + config.methodConstMethodOffset); return config.extraStackEntries + (unsafe.getShort(metaspaceConstMethod + config.constMethodMaxStackOffset) & 0xFFFF); } @@ -242,15 +242,15 @@ public StackTraceElement asStackTraceElement(int bci) { if (bci < 0 || bci >= codeSize) { // HotSpot code can only construct stack trace elements for valid bcis - StackTraceElement ste = graalRuntime().getCompilerToVM().getStackTraceElement(metaspaceMethod, 0); + StackTraceElement ste = runtime().getCompilerToVM().getStackTraceElement(metaspaceMethod, 0); return new StackTraceElement(ste.getClassName(), ste.getMethodName(), ste.getFileName(), -1); } - return graalRuntime().getCompilerToVM().getStackTraceElement(metaspaceMethod, bci); + return runtime().getCompilerToVM().getStackTraceElement(metaspaceMethod, bci); } public ResolvedJavaMethod uniqueConcreteMethod() { HotSpotResolvedObjectType[] resultHolder = {null}; - long ucm = graalRuntime().getCompilerToVM().getUniqueConcreteMethod(metaspaceMethod, resultHolder); + long ucm = runtime().getCompilerToVM().getUniqueConcreteMethod(metaspaceMethod, resultHolder); if (ucm != 0L) { assert resultHolder[0] != null; return resultHolder[0].createMethod(ucm); @@ -261,13 +261,13 @@ @Override public HotSpotSignature getSignature() { if (signature == null) { - signature = new HotSpotSignature(graalRuntime().getCompilerToVM().getSignature(metaspaceMethod)); + signature = new HotSpotSignature(runtime().getCompilerToVM().getSignature(metaspaceMethod)); } return signature; } public int getCompiledCodeSize() { - return graalRuntime().getCompilerToVM().getCompiledCodeSize(metaspaceMethod); + return runtime().getCompilerToVM().getCompiledCodeSize(metaspaceMethod); } public boolean hasCompiledCode() { @@ -279,7 +279,7 @@ ProfilingInfo info; if (UseProfilingInformation.getValue() && methodData == null) { - long metaspaceMethodData = unsafeReadWord(metaspaceMethod + graalRuntime().getConfig().methodDataOffset); + long metaspaceMethodData = unsafeReadWord(metaspaceMethod + runtime().getConfig().methodDataOffset); if (metaspaceMethodData != 0) { methodData = new HotSpotMethodData(metaspaceMethodData); } @@ -297,7 +297,7 @@ @Override public void reprofile() { - graalRuntime().getCompilerToVM().reprofile(metaspaceMethod); + runtime().getCompilerToVM().reprofile(metaspaceMethod); } @Override @@ -343,7 +343,7 @@ // Cannot use toJava() as it ignores the return type HotSpotSignature sig = getSignature(); JavaType[] sigTypes = MetaUtil.signatureToTypes(sig, null); - MetaAccessProvider metaAccess = graalRuntime().getProviders().getMetaAccess(); + MetaAccessProvider metaAccess = runtime().getProviders().getMetaAccess(); for (Method method : holder.mirror().getDeclaredMethods()) { if (method.getName().equals(name)) { if (metaAccess.lookupJavaType(method.getReturnType()).equals(sig.getReturnType(holder))) { @@ -409,12 +409,12 @@ if (dontInline) { return false; } - return graalRuntime().getCompilerToVM().isMethodCompilable(metaspaceMethod); + return runtime().getCompilerToVM().isMethodCompilable(metaspaceMethod); } @Override public LineNumberTable getLineNumberTable() { - long[] values = graalRuntime().getCompilerToVM().getLineNumberTable(this); + long[] values = runtime().getCompilerToVM().getLineNumberTable(this); if (values == null) { return null; } @@ -432,7 +432,7 @@ @Override public LocalVariableTable getLocalVariableTable() { - Local[] locals = graalRuntime().getCompilerToVM().getLocalVariableTable(this); + Local[] locals = runtime().getCompilerToVM().getLocalVariableTable(this); if (locals == null) { return null; } @@ -449,12 +449,12 @@ if (!isInVirtualMethodTable() || !holder.isInitialized()) { throw new GraalInternalError("%s does not have a vtable entry", this); } - return graalRuntime().getCompilerToVM().getVtableEntryOffset(metaspaceMethod); + return runtime().getCompilerToVM().getVtableEntryOffset(metaspaceMethod); } @Override public boolean isInVirtualMethodTable() { - return graalRuntime().getCompilerToVM().hasVtableEntry(metaspaceMethod); + return runtime().getCompilerToVM().hasVtableEntry(metaspaceMethod); } public void setCurrentTask(CompilationTask task) { @@ -473,7 +473,7 @@ } public int intrinsicId() { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); return unsafe.getByte(metaspaceMethod + config.methodIntrinsicIdOffset) & 0xff; } @@ -526,11 +526,11 @@ do { long address = getAccessFlagsAddress(); int actualValue = unsafe.getInt(address); - int expectedValue = actualValue & ~graalRuntime().getConfig().methodQueuedForCompilationBit; + int expectedValue = actualValue & ~runtime().getConfig().methodQueuedForCompilationBit; if (actualValue != expectedValue) { return false; } else { - int newValue = expectedValue | graalRuntime().getConfig().methodQueuedForCompilationBit; + int newValue = expectedValue | runtime().getConfig().methodQueuedForCompilationBit; boolean success = unsafe.compareAndSwapInt(null, address, expectedValue, newValue); if (success) { return true; @@ -544,17 +544,17 @@ boolean success; do { int actualValue = unsafe.getInt(address); - int newValue = actualValue & ~graalRuntime().getConfig().methodQueuedForCompilationBit; + int newValue = actualValue & ~runtime().getConfig().methodQueuedForCompilationBit; assert isQueuedForCompilation() : "queued for compilation must be set"; success = unsafe.compareAndSwapInt(null, address, actualValue, newValue); } while (!success); } public boolean isQueuedForCompilation() { - return (unsafe.getInt(getAccessFlagsAddress()) & graalRuntime().getConfig().methodQueuedForCompilationBit) != 0; + return (unsafe.getInt(getAccessFlagsAddress()) & runtime().getConfig().methodQueuedForCompilationBit) != 0; } private long getAccessFlagsAddress() { - return metaspaceMethod + graalRuntime().getConfig().methodAccessFlagsOffset; + return metaspaceMethod + runtime().getConfig().methodAccessFlagsOffset; } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java Tue Oct 15 22:21:01 2013 +0200 @@ -38,6 +38,6 @@ @Override public String getSourceFileName() { - return graalRuntime().getCompilerToVM().getFileName(this); + return runtime().getCompilerToVM().getFileName(this); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java Tue Oct 15 22:21:01 2013 +0200 @@ -105,7 +105,7 @@ */ public static ResolvedJavaType fromMetaspaceKlass(long metaspaceKlass) { assert metaspaceKlass != 0; - Class javaClass = (Class) unsafe.getObject(null, metaspaceKlass + graalRuntime().getConfig().classMirrorOffset); + Class javaClass = (Class) unsafe.getObject(null, metaspaceKlass + runtime().getConfig().classMirrorOffset); assert javaClass != null; return fromClass(javaClass); } @@ -117,9 +117,9 @@ */ public static ResolvedJavaType fromClass(Class javaClass) { assert javaClass != null; - ResolvedJavaType type = (ResolvedJavaType) unsafe.getObject(javaClass, (long) graalRuntime().getConfig().graalMirrorInClassOffset); + ResolvedJavaType type = (ResolvedJavaType) unsafe.getObject(javaClass, (long) runtime().getConfig().graalMirrorInClassOffset); if (type == null) { - type = graalRuntime().getCompilerToVM().getResolvedType(javaClass); + type = runtime().getCompilerToVM().getResolvedType(javaClass); assert type != null; } return type; @@ -147,7 +147,7 @@ } public int getAccessFlags() { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); return unsafe.getInt(metaspaceKlass + config.klassAccessFlagsOffset); } @@ -167,11 +167,11 @@ @Override public ResolvedJavaType findUniqueConcreteSubtype() { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); if (isArray()) { return isFinal(getElementalType(this).getModifiers()) ? this : null; } else if (isInterface()) { - return graalRuntime().getCompilerToVM().getUniqueImplementor(this); + return runtime().getCompilerToVM().getUniqueImplementor(this); } else { HotSpotResolvedObjectType type = this; while (isAbstract(type.getModifiers())) { @@ -265,12 +265,12 @@ @Override public boolean hasFinalizableSubclass() { assert !isArray(); - return graalRuntime().getCompilerToVM().hasFinalizableSubclass(this); + return runtime().getCompilerToVM().hasFinalizableSubclass(this); } @Override public boolean hasFinalizer() { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); return (getAccessFlags() & config.klassHasFinalizerFlag) != 0; } @@ -287,7 +287,7 @@ @Override public boolean isInitialized() { if (!isInitialized) { - isInitialized = graalRuntime().getCompilerToVM().isTypeInitialized(this); + isInitialized = runtime().getCompilerToVM().isTypeInitialized(this); } return isInitialized; } @@ -295,7 +295,7 @@ @Override public boolean isLinked() { if (!isLinked) { - isLinked = graalRuntime().getCompilerToVM().isTypeLinked(this); + isLinked = runtime().getCompilerToVM().isTypeLinked(this); } return isLinked; } @@ -303,8 +303,8 @@ @Override public void initialize() { if (!isInitialized) { - graalRuntime().getCompilerToVM().initializeType(this); - assert graalRuntime().getCompilerToVM().isTypeInitialized(this); + runtime().getCompilerToVM().initializeType(this); + assert runtime().getCompilerToVM().isTypeInitialized(this); } isInitialized = true; } @@ -345,7 +345,7 @@ @Override public ResolvedJavaMethod resolveMethod(ResolvedJavaMethod method) { assert method instanceof HotSpotMethod; - ResolvedJavaMethod res = (ResolvedJavaMethod) graalRuntime().getCompilerToVM().resolveMethod(this, method.getName(), ((HotSpotSignature) method.getSignature()).getMethodDescriptor()); + ResolvedJavaMethod res = (ResolvedJavaMethod) runtime().getCompilerToVM().resolveMethod(this, method.getName(), ((HotSpotSignature) method.getSignature()).getMethodDescriptor()); if (res == null || isAbstract(res.getModifiers())) { return null; } @@ -432,7 +432,7 @@ if (isArray() || isInterface()) { instanceFields = new HotSpotResolvedJavaField[0]; } else { - HotSpotResolvedJavaField[] myFields = graalRuntime().getCompilerToVM().getInstanceFields(this); + HotSpotResolvedJavaField[] myFields = runtime().getCompilerToVM().getInstanceFields(this); Arrays.sort(myFields, new OffsetComparator()); if (javaMirror != Object.class) { HotSpotResolvedJavaField[] superFields = (HotSpotResolvedJavaField[]) getSuperclass().getInstanceFields(true); @@ -468,7 +468,7 @@ @Override public String getSourceFileName() { - return graalRuntime().getCompilerToVM().getFileName(this); + return runtime().getCompilerToVM().getFileName(this); } @Override @@ -485,20 +485,20 @@ * Gets the address of the C++ Klass object for this type. */ public Constant klass() { - return Constant.forIntegerKind(graalRuntime().getTarget().wordKind, metaspaceKlass, this); + return Constant.forIntegerKind(runtime().getTarget().wordKind, metaspaceKlass, this); } public boolean isPrimaryType() { - return graalRuntime().getConfig().secondarySuperCacheOffset != superCheckOffset(); + return runtime().getConfig().secondarySuperCacheOffset != superCheckOffset(); } public int superCheckOffset() { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); return unsafe.getInt(metaspaceKlass + config.superCheckOffsetOffset); } public long prototypeMarkWord() { - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); if (isArray()) { return config.arrayPrototypeMarkWord; } else { @@ -544,7 +544,7 @@ Constructor[] constructors = javaMirror.getDeclaredConstructors(); ResolvedJavaMethod[] result = new ResolvedJavaMethod[constructors.length]; for (int i = 0; i < constructors.length; i++) { - result[i] = graalRuntime().getProviders().getMetaAccess().lookupJavaConstructor(constructors[i]); + result[i] = runtime().getProviders().getMetaAccess().lookupJavaConstructor(constructors[i]); assert result[i].isConstructor(); } return result; @@ -555,14 +555,14 @@ Method[] methods = javaMirror.getDeclaredMethods(); ResolvedJavaMethod[] result = new ResolvedJavaMethod[methods.length]; for (int i = 0; i < methods.length; i++) { - result[i] = graalRuntime().getProviders().getMetaAccess().lookupJavaMethod(methods[i]); + result[i] = runtime().getProviders().getMetaAccess().lookupJavaMethod(methods[i]); assert !result[i].isConstructor(); } return result; } public ResolvedJavaMethod getClassInitializer() { - ResolvedJavaMethod[] methods = graalRuntime().getCompilerToVM().getMethods(this); + ResolvedJavaMethod[] methods = runtime().getCompilerToVM().getMethods(this); for (ResolvedJavaMethod m : methods) { if (m.isClassInitializer()) { return m;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSignature.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSignature.java Tue Oct 15 22:21:01 2013 +0200 @@ -134,7 +134,7 @@ } JavaType type = parameterTypes[index]; if (type == null || !(type instanceof ResolvedJavaType)) { - type = graalRuntime().lookupType(parameters.get(index), (HotSpotResolvedObjectType) accessingClass, false); + type = runtime().lookupType(parameters.get(index), (HotSpotResolvedObjectType) accessingClass, false); parameterTypes[index] = type; } return type; @@ -153,7 +153,7 @@ @Override public JavaType getReturnType(ResolvedJavaType accessingClass) { if (returnTypeCache == null || !(returnTypeCache instanceof ResolvedJavaType)) { - returnTypeCache = graalRuntime().lookupType(returnType, (HotSpotResolvedObjectType) accessingClass, false); + returnTypeCache = runtime().lookupType(returnType, (HotSpotResolvedObjectType) accessingClass, false); } return returnTypeCache; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Tue Oct 15 22:21:01 2013 +0200 @@ -34,10 +34,10 @@ public class HotSpotSuitesProvider implements SuitesProvider { protected final Suites defaultSuites; - private final HotSpotGraalRuntime graalRuntime; + private final HotSpotGraalRuntime runtime; - public HotSpotSuitesProvider(HotSpotGraalRuntime graalRuntime) { - this.graalRuntime = graalRuntime; + public HotSpotSuitesProvider(HotSpotGraalRuntime runtime) { + this.runtime = runtime; defaultSuites = createSuites(); } @@ -50,7 +50,7 @@ if (AOTCompilation.getValue()) { // lowering introduces class constants, therefore it must be after lowering - ret.getHighTier().appendPhase(new LoadJavaMirrorWithKlassPhase(graalRuntime.getConfig().classMirrorOffset)); + ret.getHighTier().appendPhase(new LoadJavaMirrorWithKlassPhase(runtime.getConfig().classMirrorOffset)); if (VerifyPhases.getValue()) { ret.getHighTier().appendPhase(new AheadOfTimeVerificationPhase()); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotUnresolvedJavaType.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotUnresolvedJavaType.java Tue Oct 15 22:21:01 2013 +0200 @@ -86,6 +86,6 @@ @Override public ResolvedJavaType resolve(ResolvedJavaType accessingClass) { - return (ResolvedJavaType) graalRuntime().lookupType(getName(), (HotSpotResolvedObjectType) accessingClass, true); + return (ResolvedJavaType) runtime().lookupType(getName(), (HotSpotResolvedObjectType) accessingClass, true); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Tue Oct 15 22:21:01 2013 +0200 @@ -41,7 +41,7 @@ @Override public void generate(LIRGeneratorTool gen) { - Register rawThread = graalRuntime().getProviders().getRegisters().getThreadRegister(); + Register rawThread = runtime().getProviders().getRegisters().getThreadRegister(); gen.setResult(this, rawThread.asValue(this.kind())); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Tue Oct 15 22:21:01 2013 +0200 @@ -60,7 +60,7 @@ @Override public void generate(LIRGeneratorTool generator) { LIRGenerator gen = (LIRGenerator) generator; - HotSpotVMConfig config = graalRuntime().getConfig(); + HotSpotVMConfig config = runtime().getConfig(); ResolvedJavaMethod method = frameState.method(); boolean isStatic = Modifier.isStatic(method.getModifiers());
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java Tue Oct 15 22:21:01 2013 +0200 @@ -46,7 +46,7 @@ */ @Fold private static long crcTableAddress() { - return graalRuntime().getConfig().crcTableAddress; + return runtime().getConfig().crcTableAddress; } @MethodSubstitution(isStatic = true)
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Tue Oct 15 22:21:01 2013 +0200 @@ -47,7 +47,7 @@ public class HotSpotReplacementsUtil { public static HotSpotVMConfig config() { - return graalRuntime().getConfig(); + return runtime().getConfig(); } @Fold @@ -198,22 +198,22 @@ @Fold public static Kind getWordKind() { - return graalRuntime().getTarget().wordKind; + return runtime().getTarget().wordKind; } @Fold public static Register threadRegister() { - return graalRuntime().getProviders().getRegisters().getThreadRegister(); + return runtime().getProviders().getRegisters().getThreadRegister(); } @Fold public static Register stackPointerRegister() { - return graalRuntime().getProviders().getRegisters().getStackPointerRegister(); + return runtime().getProviders().getRegisters().getStackPointerRegister(); } @Fold public static int wordSize() { - return graalRuntime().getTarget().wordSize; + return runtime().getTarget().wordSize; } @Fold
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Tue Oct 15 22:21:01 2013 +0200 @@ -69,7 +69,7 @@ * {@code N == } {@link GraalOptions#InstanceOfMaxHints}). */ public static double hintHitProbabilityThresholdForDeoptimizingSnippet() { - return 1.0D - (1.0D / (graalRuntime().getConfig().compileThreshold * 10)); + return 1.0D - (1.0D / (runtime().getConfig().compileThreshold * 10)); } /**
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeArrayCopySnippets.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeArrayCopySnippets.java Tue Oct 15 22:21:01 2013 +0200 @@ -42,7 +42,7 @@ public class UnsafeArrayCopySnippets implements Snippets { - private static final boolean supportsUnalignedMemoryAccess = graalRuntime().getTarget().arch.supportsUnalignedMemoryAccess(); + private static final boolean supportsUnalignedMemoryAccess = runtime().getTarget().arch.supportsUnalignedMemoryAccess(); private static final Kind VECTOR_KIND = Kind.Long; private static final long VECTOR_SIZE = arrayIndexScale(Kind.Long);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Tue Oct 15 22:21:01 2013 +0200 @@ -64,7 +64,7 @@ // convert the hub (i.e., Klass*) for int[] to be a naked word. This should be safe since // the int[] class will never be unloaded. Constant intArrayHub = intArrayType.klass(); - intArrayHub = Constant.forIntegerKind(graalRuntime().getTarget().wordKind, intArrayHub.asLong(), null); + intArrayHub = Constant.forIntegerKind(runtime().getTarget().wordKind, intArrayHub.asLong(), null); Arguments args = new Arguments(stub, GuardsStage.FLOATING_GUARDS); args.add("hub", null);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java Tue Oct 15 22:21:01 2013 +0200 @@ -65,7 +65,7 @@ // convert the hub (i.e., Klass*) for int[] to be a naked word. This should be safe since // the int[] class will never be unloaded. Constant intArrayHub = intArrayType.klass(); - intArrayHub = Constant.forIntegerKind(graalRuntime().getTarget().wordKind, intArrayHub.asLong(), null); + intArrayHub = Constant.forIntegerKind(runtime().getTarget().wordKind, intArrayHub.asLong(), null); Arguments args = new Arguments(stub, GuardsStage.FLOATING_GUARDS); args.add("hub", null);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Tue Oct 15 22:21:01 2013 +0200 @@ -166,7 +166,7 @@ Stub stub = Stub.this; HotSpotRuntimeStub installedCode = new HotSpotRuntimeStub(stub); HotSpotCompiledCode hsCompResult = new HotSpotCompiledRuntimeStub(stub, compResult); - CodeInstallResult result = graalRuntime().getCompilerToVM().installCode(hsCompResult, installedCode, null); + CodeInstallResult result = runtime().getCompilerToVM().installCode(hsCompResult, installedCode, null); if (result != CodeInstallResult.OK) { throw new GraalInternalError("Error installing stub %s: %s", Stub.this, result); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java Tue Oct 15 22:21:01 2013 +0200 @@ -87,7 +87,7 @@ */ @Fold public static boolean cAssertionsEnabled() { - return graalRuntime().getConfig().cAssertions; + return runtime().getConfig().cAssertions; } @NodeIntrinsic(StubForeignCallNode.class)
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Tue Oct 15 22:21:01 2013 +0200 @@ -80,7 +80,7 @@ CustomCanonicalizer customCanonicalizer = new PartialEvaluatorCanonicalizer(providers.getMetaAccess(), providers.getConstantReflection()); this.canonicalizer = new CanonicalizerPhase(!AOTCompilation.getValue(), customCanonicalizer); this.skippedExceptionTypes = TruffleCompilerImpl.getSkippedExceptionTypes(providers.getMetaAccess()); - this.cache = HotSpotGraalRuntime.graalRuntime().getCache(); + this.cache = HotSpotGraalRuntime.runtime().getCache(); this.truffleCache = truffleCache; try {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Tue Oct 15 22:19:41 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Tue Oct 15 22:21:01 2013 +0200 @@ -59,7 +59,7 @@ private final PartialEvaluator partialEvaluator; private final Backend backend; private final ResolvedJavaType[] skippedExceptionTypes; - private final HotSpotGraalRuntime graalRuntime; + private final HotSpotGraalRuntime runtime; private final TruffleCache truffleCache; private static final Class[] SKIPPED_EXCEPTION_CLASSES = new Class[]{SlowPathException.class, UnexpectedResultException.class, ArithmeticException.class}; @@ -72,7 +72,7 @@ this.providers = GraalCompiler.getGraalProviders().copyWith(truffleReplacements); this.suites = Graal.getRequiredCapability(SuitesProvider.class).createSuites(); this.backend = Graal.getRequiredCapability(Backend.class); - this.graalRuntime = HotSpotGraalRuntime.graalRuntime(); + this.runtime = HotSpotGraalRuntime.runtime(); this.skippedExceptionTypes = getSkippedExceptionTypes(providers.getMetaAccess()); final GraphBuilderConfiguration config = GraphBuilderConfiguration.getEagerDefault(); @@ -113,7 +113,7 @@ final StructuredGraph graph; final GraphBuilderConfiguration config = GraphBuilderConfiguration.getDefault(); config.setSkippedExceptionTypes(skippedExceptionTypes); - graalRuntime.evictDeoptedGraphs(); + runtime.evictDeoptedGraphs(); compilable.timeCompilationStarted = System.nanoTime(); Assumptions assumptions = new Assumptions(true);