Mercurial > hg > truffle
changeset 5278:74dfa6f86879
removed last remaining references to vmEntries and vmExits
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/Compiler.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/Compiler.java Tue Apr 24 13:04:43 2012 +0200 @@ -32,8 +32,8 @@ public interface Compiler { - CompilerToVM getVMEntries(); - VMToCompiler getVMExits(); + CompilerToVM getCompilerToVM(); + VMToCompiler getVMToCompiler(); GraalCompiler getCompiler(); RiType lookupType(String returnType, HotSpotTypeResolved accessingClass, boolean eagerResolve); HotSpotVMConfig getConfig();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerImpl.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerImpl.java Tue Apr 24 13:04:43 2012 +0200 @@ -87,8 +87,8 @@ return theInstance; } - private final CompilerToVM vmEntries; - private final VMToCompiler vmExits; + private final CompilerToVM compilerToVm; + private final VMToCompiler vmToCompiler; private HotSpotRuntime runtime; private GraalCompiler compiler; @@ -103,10 +103,10 @@ private CompilerImpl(CompilerToVM initialEntries) { - CompilerToVM entries = initialEntries; - // initialize VMEntries - if (entries == null) { - entries = new CompilerToVMImpl(); + CompilerToVM toVM = initialEntries; + // initialize CompilerToVM + if (toVM == null) { + toVM = new CompilerToVMImpl(); } // initialize VMExits @@ -115,19 +115,19 @@ // logging, etc. if (CountingProxy.ENABLED) { exits = CountingProxy.getProxy(VMToCompiler.class, exits); - entries = CountingProxy.getProxy(CompilerToVM.class, entries); + toVM = CountingProxy.getProxy(CompilerToVM.class, toVM); } if (Logger.ENABLED) { exits = LoggingProxy.getProxy(VMToCompiler.class, exits); - entries = LoggingProxy.getProxy(CompilerToVM.class, entries); + toVM = LoggingProxy.getProxy(CompilerToVM.class, toVM); } // set the final fields - vmEntries = entries; - vmExits = exits; + compilerToVm = toVM; + vmToCompiler = exits; // initialize compiler - config = vmEntries.getConfiguration(); + config = compilerToVm.getConfiguration(); config.check(); if (Boolean.valueOf(System.getProperty("graal.printconfig"))) { @@ -192,19 +192,19 @@ } @Override - public CompilerToVM getVMEntries() { - return vmEntries; + public CompilerToVM getCompilerToVM() { + return compilerToVm; } @Override - public VMToCompiler getVMExits() { - return vmExits; + public VMToCompiler getVMToCompiler() { + return vmToCompiler; } @Override public RiType lookupType(String returnType, HotSpotTypeResolved accessingClass, boolean eagerResolve) { - if (returnType.length() == 1 && vmExits instanceof VMToCompilerImpl) { - VMToCompilerImpl exitsNative = (VMToCompilerImpl) vmExits; + if (returnType.length() == 1 && vmToCompiler instanceof VMToCompilerImpl) { + VMToCompilerImpl exitsNative = (VMToCompilerImpl) vmToCompiler; CiKind kind = CiKind.fromPrimitiveOrVoidTypeChar(returnType.charAt(0)); switch(kind) { case Boolean: @@ -233,7 +233,7 @@ return exitsNative.typeVoid; } } - return vmEntries.RiSignature_lookupType(returnType, accessingClass, eagerResolve); + return compilerToVm.RiSignature_lookupType(returnType, accessingClass, eagerResolve); } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Tue Apr 24 13:04:43 2012 +0200 @@ -57,7 +57,7 @@ public void run() { if (GraalOptions.Debug) { Debug.enable(); - HotSpotDebugConfig hotspotDebugConfig = new HotSpotDebugConfig(GraalOptions.Log, GraalOptions.Meter, GraalOptions.Time, GraalOptions.Dump, GraalOptions.MethodFilter); + HotSpotDebugConfig hotspotDebugConfig = new HotSpotDebugConfig(GraalOptions.Log, GraalOptions.Meter, GraalOptions.Time, GraalOptions.Dump, GraalOptions.MethodFilter, GraalOptions.LogFile); Debug.setConfig(hotspotDebugConfig); } super.run();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotTargetMethod.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotTargetMethod.java Tue Apr 24 13:04:43 2012 +0200 @@ -101,7 +101,7 @@ } public static Object installStub(Compiler compiler, CiTargetMethod targetMethod, String name, HotSpotCodeInfo info) { - return compiler.getVMEntries().installStub(new HotSpotTargetMethod(compiler, targetMethod, name), info); + return compiler.getCompilerToVM().installStub(new HotSpotTargetMethod(compiler, targetMethod, name), info); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/logging/Logger.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/logging/Logger.java Tue Apr 24 13:04:43 2012 +0200 @@ -27,7 +27,7 @@ import java.util.*; /** - * Scoped logging class used to display the call hierarchy of VMEntries/VMExits calls. + * Scoped logging class used to display the call hierarchy of VMToCompiler/CompilerToVM calls. */ public class Logger {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/package-info.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/package-info.java Tue Apr 24 13:04:43 2012 +0200 @@ -22,7 +22,7 @@ */ /** * Package containing the runtime interface (defined in the CRI project) implementation for HotSpot. - * There is a class that bridges from the C++ to the Java side (VMExitsNative.java) and one that bridges - * from the Java to the C++ side (VMEntriesNative.java). + * There is a class that bridges from the C++ to the Java side (VMToCompilerImpl.java) and one that bridges + * from the Java to the C++ side (CompilerToVMImpl.java). */ package com.oracle.graal.hotspot;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Tue Apr 24 13:04:43 2012 +0200 @@ -68,7 +68,7 @@ assert method.signature().argumentKindAt(0, false) == CiKind.Object; assert method.signature().argumentKindAt(1, false) == CiKind.Object; assert !Modifier.isStatic(method.accessFlags()) || method.signature().argumentKindAt(2, false) == CiKind.Object; - return compiler.getVMEntries().executeCompiledMethod(this, arg1, arg2, arg3); + return compiler.getCompilerToVM().executeCompiledMethod(this, arg1, arg2, arg3); } private boolean checkArgs(Object... args) { @@ -88,6 +88,6 @@ @Override public Object executeVarargs(Object... args) { assert checkArgs(args); - return compiler.getVMEntries().executeCompiledMethodVarargs(this, args); + return compiler.getCompilerToVM().executeCompiledMethodVarargs(this, args); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotConstantPool.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotConstantPool.java Tue Apr 24 13:04:43 2012 +0200 @@ -30,10 +30,9 @@ * Implementation of RiConstantPool for HotSpot. */ public class HotSpotConstantPool extends CompilerObject implements RiConstantPool { - /** - * - */ + private static final long serialVersionUID = -5443206401485234850L; + private final HotSpotTypeResolvedImpl type; public HotSpotConstantPool(Compiler compiler, HotSpotTypeResolvedImpl type) { @@ -43,7 +42,7 @@ @Override public Object lookupConstant(int cpi) { - Object constant = compiler.getVMEntries().RiConstantPool_lookupConstant(type, cpi); + Object constant = compiler.getCompilerToVM().RiConstantPool_lookupConstant(type, cpi); return constant; } @@ -54,21 +53,21 @@ @Override public RiMethod lookupMethod(int cpi, int byteCode) { - return compiler.getVMEntries().RiConstantPool_lookupMethod(type, cpi, (byte) byteCode); + return compiler.getCompilerToVM().RiConstantPool_lookupMethod(type, cpi, (byte) byteCode); } @Override public RiType lookupType(int cpi, int opcode) { - return compiler.getVMEntries().RiConstantPool_lookupType(type, cpi); + return compiler.getCompilerToVM().RiConstantPool_lookupType(type, cpi); } @Override public RiField lookupField(int cpi, int opcode) { - return compiler.getVMEntries().RiConstantPool_lookupField(type, cpi, (byte) opcode); + return compiler.getCompilerToVM().RiConstantPool_lookupField(type, cpi, (byte) opcode); } @Override public void loadReferencedType(int cpi, int bytecode) { - compiler.getVMEntries().RiConstantPool_loadReferencedType(type, cpi, (byte) bytecode); + compiler.getCompilerToVM().RiConstantPool_loadReferencedType(type, cpi, (byte) bytecode); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodData.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodData.java Tue Apr 24 13:04:43 2012 +0200 @@ -346,7 +346,7 @@ Object graalMirror = unsafe.getObject(receiverKlassOop, (long) config.graalMirrorKlassOffset); if (graalMirror == null) { Class<?> javaClass = (Class<?>) unsafe.getObject(receiverKlassOop, (long) config.classMirrorOffset); - graalMirror = CompilerImpl.getInstance().getVMEntries().getType(javaClass); + graalMirror = CompilerImpl.getInstance().getCompilerToVM().getType(javaClass); assert graalMirror != null : "must not return null"; } sparseTypes[entries] = (RiResolvedType) graalMirror;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java Tue Apr 24 13:04:43 2012 +0200 @@ -85,7 +85,7 @@ @Override public byte[] code() { if (code == null) { - code = compiler.getVMEntries().RiMethod_code(this); + code = compiler.getCompilerToVM().RiMethod_code(this); assert code.length == codeSize : "expected: " + codeSize + ", actual: " + code.length; } return code; @@ -98,13 +98,13 @@ @Override public RiExceptionHandler[] exceptionHandlers() { - return compiler.getVMEntries().RiMethod_exceptionHandlers(this); + return compiler.getCompilerToVM().RiMethod_exceptionHandlers(this); } @Override public boolean hasBalancedMonitors() { if (hasBalancedMonitors == null) { - hasBalancedMonitors = compiler.getVMEntries().RiMethod_hasBalancedMonitors(this); + hasBalancedMonitors = compiler.getCompilerToVM().RiMethod_hasBalancedMonitors(this); } return hasBalancedMonitors; } @@ -157,21 +157,21 @@ public StackTraceElement toStackTraceElement(int bci) { if (bci < 0 || bci >= codeSize) { // HotSpot code can only construct stack trace elements for valid bcis - StackTraceElement ste = compiler.getVMEntries().RiMethod_toStackTraceElement(this, 0); + StackTraceElement ste = compiler.getCompilerToVM().RiMethod_toStackTraceElement(this, 0); return new StackTraceElement(ste.getClassName(), ste.getMethodName(), ste.getFileName(), -1); } - return compiler.getVMEntries().RiMethod_toStackTraceElement(this, bci); + return compiler.getCompilerToVM().RiMethod_toStackTraceElement(this, bci); } @Override public RiResolvedMethod uniqueConcreteMethod() { - return (RiResolvedMethod) compiler.getVMEntries().RiMethod_uniqueConcreteMethod(this); + return (RiResolvedMethod) compiler.getCompilerToVM().RiMethod_uniqueConcreteMethod(this); } @Override public RiSignature signature() { if (signature == null) { - signature = new HotSpotSignature(compiler, compiler.getVMEntries().RiMethod_signature(this)); + signature = new HotSpotSignature(compiler, compiler.getCompilerToVM().RiMethod_signature(this)); } return signature; } @@ -182,11 +182,11 @@ } public boolean hasCompiledCode() { - return compiler.getVMEntries().RiMethod_hasCompiledCode(this); + return compiler.getCompilerToVM().RiMethod_hasCompiledCode(this); } public int compiledCodeSize() { - return compiler.getVMEntries().RiMethod_getCompiledCodeSize(this); + return compiler.getCompilerToVM().RiMethod_getCompiledCodeSize(this); } @Override @@ -201,7 +201,7 @@ @Override public int invocationCount() { - return compiler.getVMEntries().RiMethod_invocationCount(this); + return compiler.getCompilerToVM().RiMethod_invocationCount(this); } @Override @@ -223,7 +223,7 @@ @Override public RiProfilingInfo profilingInfo() { if (GraalOptions.UseProfilingInformation && methodData == null) { - methodData = compiler.getVMEntries().RiMethod_methodData(this); + methodData = compiler.getCompilerToVM().RiMethod_methodData(this); } if (methodData == null) { @@ -365,7 +365,7 @@ @Override public int vtableEntryOffset() { - return compiler.getVMEntries().RiMethod_vtableEntryOffset(this); + return compiler.getCompilerToVM().RiMethod_vtableEntryOffset(this); } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Tue Apr 24 13:04:43 2012 +0200 @@ -177,22 +177,22 @@ @Override public String disassemble(RiResolvedMethod method) { - return compiler.getVMEntries().disassembleJava((HotSpotMethodResolved) method); + return compiler.getCompilerToVM().disassembleJava((HotSpotMethodResolved) method); } @Override public RiResolvedType asRiType(CiKind kind) { - return (RiResolvedType) compiler.getVMEntries().getType(kind.toJavaClass()); + return (RiResolvedType) compiler.getCompilerToVM().getType(kind.toJavaClass()); } @Override public RiResolvedType getTypeOf(CiConstant constant) { - return (RiResolvedType) compiler.getVMEntries().getRiType(constant); + return (RiResolvedType) compiler.getCompilerToVM().getRiType(constant); } @Override public boolean isExceptionType(RiResolvedType type) { - return type.isSubtypeOf((RiResolvedType) compiler.getVMEntries().getType(Throwable.class)); + return type.isSubtypeOf((RiResolvedType) compiler.getCompilerToVM().getType(Throwable.class)); } @Override @@ -219,7 +219,7 @@ @Override public boolean areConstantObjectsEqual(CiConstant x, CiConstant y) { - return compiler.getVMEntries().compareConstantObjects(x, y); + return compiler.getCompilerToVM().compareConstantObjects(x, y); } @Override @@ -243,7 +243,7 @@ @Override public int getArrayLength(CiConstant array) { - return compiler.getVMEntries().getArrayLength(array); + return compiler.getCompilerToVM().getArrayLength(array); } @Override @@ -463,7 +463,7 @@ } public RiResolvedType getType(Class<?> clazz) { - return (RiResolvedType) compiler.getVMEntries().getType(clazz); + return (RiResolvedType) compiler.getCompilerToVM().getType(clazz); } public Object asCallTarget(Object target) { @@ -471,21 +471,21 @@ } public long getMaxCallTargetOffset(CiRuntimeCall rtcall) { - return compiler.getVMEntries().getMaxCallTargetOffset(rtcall); + return compiler.getCompilerToVM().getMaxCallTargetOffset(rtcall); } public RiResolvedMethod getRiMethod(Method reflectionMethod) { - return (RiResolvedMethod) compiler.getVMEntries().getRiMethod(reflectionMethod); + return (RiResolvedMethod) compiler.getCompilerToVM().getRiMethod(reflectionMethod); } @Override public void installMethod(RiResolvedMethod method, CiTargetMethod code, RiCodeInfo info) { - compiler.getVMEntries().installMethod(new HotSpotTargetMethod(compiler, (HotSpotMethodResolved) method, code), true, (HotSpotCodeInfo) info); + compiler.getCompilerToVM().installMethod(new HotSpotTargetMethod(compiler, (HotSpotMethodResolved) method, code), true, (HotSpotCodeInfo) info); } @Override public RiCompiledMethod addMethod(RiResolvedMethod method, CiTargetMethod code) { - return compiler.getVMEntries().installMethod(new HotSpotTargetMethod(compiler, (HotSpotMethodResolved) method, code), false, null); + return compiler.getCompilerToVM().installMethod(new HotSpotTargetMethod(compiler, (HotSpotMethodResolved) method, code), false, null); } @Override @@ -503,7 +503,7 @@ @Override public long[] getDeoptedLeafGraphIds() { - return compiler.getVMEntries().getDeoptedLeafGraphIds(); + return compiler.getCompilerToVM().getDeoptedLeafGraphIds(); } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypePrimitive.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypePrimitive.java Tue Apr 24 13:04:43 2012 +0200 @@ -56,7 +56,7 @@ @Override public RiResolvedType arrayOf() { - return (RiResolvedType) compiler.getVMEntries().getPrimitiveArrayType(kind); + return (RiResolvedType) compiler.getCompilerToVM().getPrimitiveArrayType(kind); } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolvedImpl.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolvedImpl.java Tue Apr 24 13:04:43 2012 +0200 @@ -68,7 +68,7 @@ @Override public RiResolvedType arrayOf() { if (arrayOfType == null) { - arrayOfType = (RiResolvedType) compiler.getVMEntries().RiType_arrayOf(this); + arrayOfType = (RiResolvedType) compiler.getCompilerToVM().RiType_arrayOf(this); } return arrayOfType; } @@ -76,7 +76,7 @@ @Override public RiResolvedType componentType() { assert isArrayClass(); - return (RiResolvedType) compiler.getVMEntries().RiType_componentType(this); + return (RiResolvedType) compiler.getCompilerToVM().RiType_componentType(this); } @Override @@ -84,14 +84,14 @@ if (isArrayClass()) { return Modifier.isFinal(componentType().accessFlags()) ? this : null; } else { - return (RiResolvedType) compiler.getVMEntries().RiType_uniqueConcreteSubtype(this); + return (RiResolvedType) compiler.getCompilerToVM().RiType_uniqueConcreteSubtype(this); } } @Override public RiResolvedType superType() { if (!superTypeSet) { - superType = (RiResolvedType) compiler.getVMEntries().RiType_superType(this); + superType = (RiResolvedType) compiler.getCompilerToVM().RiType_superType(this); superTypeSet = true; } return superType; @@ -102,7 +102,7 @@ if (otherType instanceof HotSpotTypePrimitive) { return null; } else { - return (RiResolvedType) compiler.getVMEntries().RiType_leastCommonAncestor(this, (HotSpotTypeResolved) otherType); + return (RiResolvedType) compiler.getCompilerToVM().RiType_leastCommonAncestor(this, (HotSpotTypeResolved) otherType); } } @@ -158,7 +158,7 @@ @Override public boolean isInitialized() { if (!isInitialized) { - isInitialized = compiler.getVMEntries().RiType_isInitialized(this); + isInitialized = compiler.getCompilerToVM().RiType_isInitialized(this); } return isInitialized; } @@ -181,7 +181,7 @@ @Override public boolean isSubtypeOf(RiResolvedType other) { if (other instanceof HotSpotTypeResolved) { - return compiler.getVMEntries().RiType_isSubtypeOf(this, other); + return compiler.getCompilerToVM().RiType_isSubtypeOf(this, other); } // No resolved type is a subtype of an unresolved type. return false; @@ -195,7 +195,7 @@ @Override public RiResolvedMethod resolveMethodImpl(RiResolvedMethod method) { assert method instanceof HotSpotMethod; - return (RiResolvedMethod) compiler.getVMEntries().RiType_resolveMethodImpl(this, method.name(), method.signature().asString()); + return (RiResolvedMethod) compiler.getCompilerToVM().RiType_resolveMethodImpl(this, method.name(), method.signature().asString()); } @Override @@ -248,7 +248,7 @@ @Override public RiResolvedField[] declaredFields() { if (fields == null) { - fields = compiler.getVMEntries().RiType_fields(this); + fields = compiler.getCompilerToVM().RiType_fields(this); } return fields; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java Tue Apr 24 13:04:43 2012 +0200 @@ -882,7 +882,7 @@ return new XirSnippet(newObjectArrayTemplates.get(site), length, XirArgument.forObject(arrayType)); } else { assert arrayType == null; - RiType primitiveArrayType = compiler.getVMEntries().getPrimitiveArrayType(elementKind); + RiType primitiveArrayType = compiler.getCompilerToVM().getPrimitiveArrayType(elementKind); return new XirSnippet(newTypeArrayTemplates.get(site, elementKind), length, XirArgument.forObject(primitiveArrayType)); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/CompilationServer.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/CompilationServer.java Tue Apr 24 13:04:43 2012 +0200 @@ -88,11 +88,11 @@ ReplacingStreams streams = new ReplacingStreams(socket.getOutputStream(), socket.getInputStream()); - // get the VMEntries proxy from the client - CompilerToVM entries = (CompilerToVM) streams.getInvocation().waitForResult(false); + // get the CompilerToVM proxy from the client + CompilerToVM toVM = (CompilerToVM) streams.getInvocation().waitForResult(false); // return the initialized compiler to the client - Compiler compiler = CompilerImpl.initializeServer(entries); + Compiler compiler = CompilerImpl.initializeServer(toVM); compiler.getCompiler(); streams.getInvocation().sendResult(compiler);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/InvocationSocket.java Mon Apr 23 21:27:48 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/InvocationSocket.java Tue Apr 24 13:04:43 2012 +0200 @@ -47,7 +47,7 @@ cachedMethodNames.add("name"); cachedMethodNames.add("kind"); cachedMethodNames.add("isResolved"); - cachedMethodNames.add("getVMEntries"); + cachedMethodNames.add("getCompilerToVM"); cachedMethodNames.add("exactType"); cachedMethodNames.add("isInitialized"); forbiddenMethodNames.add("javaClass"); @@ -84,10 +84,8 @@ */ private static class Invocation implements Serializable { - /** - * - */ private static final long serialVersionUID = -799162779226626066L; + public Object receiver; public String methodName; public Object[] args; @@ -105,10 +103,8 @@ */ private static class Result implements Serializable { - /** - * - */ private static final long serialVersionUID = -7496058356272415814L; + public Object result; public Result(Object result) {
--- a/src/share/vm/classfile/vmSymbols.hpp Mon Apr 23 21:27:48 2012 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Tue Apr 24 13:04:43 2012 +0200 @@ -344,8 +344,8 @@ template(createCiConstantDouble_signature, "(D)Lcom/oracle/max/cri/ci/CiConstant;") \ template(createCiConstantObject_name, "createCiConstantObject") \ template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/max/cri/ci/CiConstant;") \ - template(getVMExits_name, "getVMExits") \ - template(getVMExits_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ + template(getVMToCompiler_name, "getVMToCompiler") \ + template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ template(getInstance_name, "getInstance") \ template(initialize_name, "initialize") \ template(getInstance_signature, "()Lcom/oracle/graal/hotspot/Compiler;") \
--- a/src/share/vm/graal/graalVMToCompiler.cpp Mon Apr 23 21:27:48 2012 +0200 +++ b/src/share/vm/graal/graalVMToCompiler.cpp Tue Apr 24 13:04:43 2012 +0200 @@ -26,16 +26,16 @@ // this is a *global* handle jobject VMToCompiler::_compilerPermObject = NULL; -jobject VMToCompiler::_vmExitsPermObject = NULL; -jobject VMToCompiler::_vmExitsPermKlass = NULL; +jobject VMToCompiler::_vmToCompilerPermObject = NULL; +jobject VMToCompiler::_vmToCompilerPermKlass = NULL; -KlassHandle VMToCompiler::vmExitsKlass() { - if (JNIHandles::resolve(_vmExitsPermKlass) == NULL) { +KlassHandle VMToCompiler::vmToCompilerKlass() { + if (JNIHandles::resolve(_vmToCompilerPermKlass) == NULL) { klassOop result = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_bridge_VMToCompiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(result, "Couldn't find class com.oracle.graal.hotspot.bridge.VMToCompiler"); - _vmExitsPermKlass = JNIHandles::make_global(result); + _vmToCompilerPermKlass = JNIHandles::make_global(result); } - return KlassHandle((klassOop)JNIHandles::resolve_non_null(_vmExitsPermKlass)); + return KlassHandle((klassOop)JNIHandles::resolve_non_null(_vmToCompilerPermKlass)); } Handle VMToCompiler::compilerInstance() { @@ -52,18 +52,18 @@ } Handle VMToCompiler::instance() { - if (JNIHandles::resolve(_vmExitsPermObject) == NULL) { + if (JNIHandles::resolve(_vmToCompilerPermObject) == NULL) { KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_Compiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerKlass(), "Couldn't find class com.sun.hotspot.graal.Compiler"); JavaValue result(T_OBJECT); JavaCallArguments args; args.set_receiver(compilerInstance()); - JavaCalls::call_interface(&result, compilerKlass, vmSymbols::getVMExits_name(), vmSymbols::getVMExits_signature(), &args, Thread::current()); - check_pending_exception("Couldn't get VMExits"); - _vmExitsPermObject = JNIHandles::make_global((oop) result.get_jobject()); + JavaCalls::call_interface(&result, compilerKlass, vmSymbols::getVMToCompiler_name(), vmSymbols::getVMToCompiler_signature(), &args, Thread::current()); + check_pending_exception("Couldn't get VMToCompiler"); + _vmToCompilerPermObject = JNIHandles::make_global((oop) result.get_jobject()); } - return Handle(JNIHandles::resolve_non_null(_vmExitsPermObject)); + return Handle(JNIHandles::resolve_non_null(_vmToCompilerPermObject)); } void VMToCompiler::initializeCompiler() { @@ -107,7 +107,7 @@ args.push_int(entry_bci); args.push_int(blocking); args.push_int(priority); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::compileMethod_name(), vmSymbols::compileMethod_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::compileMethod_name(), vmSymbols::compileMethod_signature(), &args, THREAD); check_pending_exception("Error while calling compileMethod"); return result.get_jboolean(); } @@ -119,16 +119,16 @@ JavaValue result(T_VOID); JavaCallArguments args; args.push_oop(instance()); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::shutdownCompiler_name(), vmSymbols::void_method_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::shutdownCompiler_name(), vmSymbols::void_method_signature(), &args, THREAD); check_pending_exception("Error while calling shutdownCompiler"); JNIHandles::destroy_global(_compilerPermObject); - JNIHandles::destroy_global(_vmExitsPermObject); - JNIHandles::destroy_global(_vmExitsPermKlass); + JNIHandles::destroy_global(_vmToCompilerPermObject); + JNIHandles::destroy_global(_vmToCompilerPermKlass); _compilerPermObject = NULL; - _vmExitsPermObject = NULL; - _vmExitsPermKlass = NULL; + _vmToCompilerPermObject = NULL; + _vmToCompilerPermKlass = NULL; } } @@ -137,7 +137,7 @@ JavaValue result(T_VOID); JavaCallArguments args; args.push_oop(instance()); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::startCompiler_name(), vmSymbols::void_method_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::startCompiler_name(), vmSymbols::void_method_signature(), &args, THREAD); check_pending_exception("Error while calling startCompiler"); } @@ -146,7 +146,7 @@ JavaValue result(T_VOID); JavaCallArguments args; args.push_oop(instance()); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::bootstrap_name(), vmSymbols::void_method_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::bootstrap_name(), vmSymbols::void_method_signature(), &args, THREAD); check_pending_exception("Error while calling boostrap"); } @@ -157,7 +157,7 @@ args.push_oop(instance()); args.push_long(vmId); args.push_oop(name); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createRiMethodResolved_name(), vmSymbols::createRiMethodResolved_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createRiMethodResolved_name(), vmSymbols::createRiMethodResolved_signature(), &args, THREAD); check_pending_exception("Error while calling createRiMethodResolved"); return (oop) result.get_jobject(); } @@ -170,7 +170,7 @@ args.push_oop(name); args.push_oop(signature); args.push_oop(holder); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createRiMethodUnresolved_name(), vmSymbols::createRiMethodUnresolved_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createRiMethodUnresolved_name(), vmSymbols::createRiMethodUnresolved_signature(), &args, THREAD); check_pending_exception("Error while calling createRiMethodUnresolved"); return (oop) result.get_jobject(); } @@ -187,7 +187,7 @@ args.push_oop(type); args.push_int(index); args.push_int(flags); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createRiField_name(), vmSymbols::createRiField_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createRiField_name(), vmSymbols::createRiField_signature(), &args, THREAD); check_pending_exception("Error while calling createRiField"); assert(result.get_type() == T_OBJECT, "just checking"); return (oop) result.get_jobject(); @@ -200,7 +200,7 @@ args.push_oop(instance()); args.push_long(vmId); args.push_oop(name); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createRiType_name(), vmSymbols::createRiType_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createRiType_name(), vmSymbols::createRiType_signature(), &args, THREAD); check_pending_exception("Error while calling createRiType"); return (oop) result.get_jobject(); } @@ -210,7 +210,7 @@ JavaCallArguments args; args.push_oop(instance()); args.push_int(basic_type); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createRiTypePrimitive_name(), vmSymbols::createRiTypePrimitive_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createRiTypePrimitive_name(), vmSymbols::createRiTypePrimitive_signature(), &args, THREAD); check_pending_exception("Error while calling createRiTypePrimitive"); return (oop) result.get_jobject(); } @@ -221,7 +221,7 @@ JavaCallArguments args; args.push_oop(instance()); args.push_oop(name); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createRiTypeUnresolved_name(), vmSymbols::createRiTypeUnresolved_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createRiTypeUnresolved_name(), vmSymbols::createRiTypeUnresolved_signature(), &args, THREAD); check_pending_exception("Error while calling createRiTypeUnresolved"); return (oop) result.get_jobject(); } @@ -232,7 +232,7 @@ JavaCallArguments args; args.push_oop(instance()); args.push_oop(name); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createRiSignature_name(), vmSymbols::createRiSignature_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createRiSignature_name(), vmSymbols::createRiSignature_signature(), &args, THREAD); check_pending_exception("Error while calling createRiSignature"); return (oop) result.get_jobject(); } @@ -243,7 +243,7 @@ args.push_oop(instance()); args.push_oop(kind()); args.push_long(value); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createCiConstant_name(), vmSymbols::createCiConstant_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createCiConstant_name(), vmSymbols::createCiConstant_signature(), &args, THREAD); check_pending_exception("Error while calling createCiConstantFloat"); return (oop) result.get_jobject(); @@ -254,7 +254,7 @@ JavaCallArguments args; args.push_oop(instance()); args.push_float(value); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createCiConstantFloat_name(), vmSymbols::createCiConstantFloat_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createCiConstantFloat_name(), vmSymbols::createCiConstantFloat_signature(), &args, THREAD); check_pending_exception("Error while calling createCiConstantFloat"); return (oop) result.get_jobject(); @@ -265,7 +265,7 @@ JavaCallArguments args; args.push_oop(instance()); args.push_double(value); - JavaCalls::call_interface(&result, vmExitsKlass(), vmSymbols::createCiConstantDouble_name(), vmSymbols::createCiConstantDouble_signature(), &args, THREAD); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::createCiConstantDouble_name(), vmSymbols::createCiConstantDouble_signature(), &args, THREAD); check_pending_exception("Error while calling createCiConstantDouble"); return (oop) result.get_jobject(); }
--- a/src/share/vm/graal/graalVMToCompiler.hpp Mon Apr 23 21:27:48 2012 +0200 +++ b/src/share/vm/graal/graalVMToCompiler.hpp Tue Apr 24 13:04:43 2012 +0200 @@ -33,10 +33,10 @@ private: static jobject _compilerPermObject; - static jobject _vmExitsPermObject; - static jobject _vmExitsPermKlass; + static jobject _vmToCompilerPermObject; + static jobject _vmToCompilerPermKlass; - static KlassHandle vmExitsKlass(); + static KlassHandle vmToCompilerKlass(); static Handle instance(); public: