Mercurial > hg > truffle
changeset 18301:0f41072d8bbc
moved use of HotSpotMetaAccessProvider to locations on the "local" side of remote compilation
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 07 Nov 2014 11:28:34 +0100 |
| parents | d1f5e41c3afe |
| children | fb289eb7243d |
| files | graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackendFactory.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProviders.java |
| diffstat | 5 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Thu Nov 06 23:49:31 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Fri Nov 07 11:28:34 2014 +0100 @@ -36,7 +36,7 @@ @ServiceProvider(HotSpotBackendFactory.class) public class HSAILHotSpotBackendFactory implements HotSpotBackendFactory { - protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntime runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, + protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) { return new HSAILHotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, target); } @@ -46,7 +46,7 @@ HotSpotProviders host = hostBackend.getProviders(); HotSpotRegisters registers = new HotSpotRegisters(HSAIL.threadRegister, Register.None, Register.None); - HotSpotMetaAccessProvider metaAccess = host.getMetaAccess(); + MetaAccessProvider metaAccess = host.getMetaAccess(); TargetDescription target = createTarget(); HSAILHotSpotCodeCacheProvider codeCache = new HSAILHotSpotCodeCacheProvider(runtime, target); ConstantReflectionProvider constantReflection = host.getConstantReflection();
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackendFactory.java Thu Nov 06 23:49:31 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackendFactory.java Fri Nov 07 11:28:34 2014 +0100 @@ -39,7 +39,7 @@ public HotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotBackend hostBackend) { HotSpotProviders host = hostBackend.getProviders(); - HotSpotMetaAccessProvider metaAccess; + MetaAccessProvider metaAccess; PTXHotSpotCodeCacheProvider codeCache; ConstantReflectionProvider constantReflection; HotSpotForeignCallsProvider foreignCalls;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Thu Nov 06 23:49:31 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Fri Nov 07 11:28:34 2014 +0100 @@ -287,7 +287,7 @@ } // Are we compiling this class? - HotSpotMetaAccessProvider metaAccess = runtime.getHostProviders().getMetaAccess(); + MetaAccessProvider metaAccess = runtime.getHostProviders().getMetaAccess(); if (classFileCounter >= startAt) { println("CompileTheWorld (%d) : %s", classFileCounter, className);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Thu Nov 06 23:49:31 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Fri Nov 07 11:28:34 2014 +0100 @@ -111,12 +111,14 @@ } public int getDeoptimizationCount(DeoptimizationReason reason) { - int reasonIndex = runtime().getHostProviders().getMetaAccess().convertDeoptReason(reason); + HotSpotMetaAccessProvider metaAccess = (HotSpotMetaAccessProvider) runtime().getHostProviders().getMetaAccess(); + int reasonIndex = metaAccess.convertDeoptReason(reason); return unsafe.getByte(metaspaceMethodData + config.methodDataOopTrapHistoryOffset + reasonIndex) & 0xFF; } public int getOSRDeoptimizationCount(DeoptimizationReason reason) { - int reasonIndex = runtime().getHostProviders().getMetaAccess().convertDeoptReason(reason); + HotSpotMetaAccessProvider metaAccess = (HotSpotMetaAccessProvider) runtime().getHostProviders().getMetaAccess(); + int reasonIndex = metaAccess.convertDeoptReason(reason); return unsafe.getByte(metaspaceMethodData + config.methodDataOopTrapHistoryOffset + config.deoptReasonOSROffset + reasonIndex) & 0xFF; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProviders.java Thu Nov 06 23:49:31 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProviders.java Fri Nov 07 11:28:34 2014 +0100 @@ -39,7 +39,7 @@ private final HotSpotRegistersProvider registers; private final SnippetReflectionProvider snippetReflection; - public HotSpotProviders(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, HotSpotForeignCallsProvider foreignCalls, + public HotSpotProviders(MetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, HotSpotForeignCallsProvider foreignCalls, LoweringProvider lowerer, Replacements replacements, HotSpotDisassemblerProvider disassembler, SuitesProvider suites, HotSpotRegistersProvider registers, SnippetReflectionProvider snippetReflection) { super(metaAccess, codeCache, constantReflection, foreignCalls, lowerer, replacements); @@ -54,11 +54,6 @@ return (HotSpotCodeCacheProvider) super.getCodeCache(); } - @Override - public HotSpotMetaAccessProvider getMetaAccess() { - return (HotSpotMetaAccessProvider) super.getMetaAccess(); - } - public HotSpotDisassemblerProvider getDisassembler() { return disassembler; }