Mercurial > hg > truffle

comparison src/share/vm/graal/graalCompilerToVM.cpp @ 9669:ed6202820ecf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed HotSpotCompilationResult to HotSpotCompiledCode and added subclasses HotSpotCompiledNmethod and HotSpotCompiledRuntimeStub
author Doug Simon <doug.simon@oracle.com>
date Mon, 13 May 2013 21:59:17 +0200
parents fe9a18fbb15e
children d04944441454
comparison
equal deleted inserted replaced
9668:fe9a18fbb15e 9669:ed6202820ecf
865 #undef set_object 865 #undef set_object
866 #undef set_int_array 866 #undef set_int_array
867 867
868 C2V_END 868 C2V_END
869 869
870 C2V_VMENTRY(jint, installCode0, (JNIEnv *jniEnv, jobject, jobject compResult, jobject installed_code, jobject triggered_deoptimizations)) 870 C2V_VMENTRY(jint, installCode0, (JNIEnv *jniEnv, jobject, jobject compiled_code, jobject installed_code, jobject triggered_deoptimizations))
871 ResourceMark rm; 871 ResourceMark rm;
872 HandleMark hm; 872 HandleMark hm;
873 Handle compResultHandle = JNIHandles::resolve(compResult); 873 Handle compiled_code_handle = JNIHandles::resolve(compiled_code);
874 CodeBlob* cb = NULL; 874 CodeBlob* cb = NULL;
875 Handle installed_code_handle = JNIHandles::resolve(installed_code); 875 Handle installed_code_handle = JNIHandles::resolve(installed_code);
876 Handle triggered_deoptimizations_handle = JNIHandles::resolve(triggered_deoptimizations); 876 Handle triggered_deoptimizations_handle = JNIHandles::resolve(triggered_deoptimizations);
877 GraalEnv::CodeInstallResult result; 877 GraalEnv::CodeInstallResult result;
878 878
879 CodeInstaller installer(compResultHandle, result, cb, installed_code_handle, triggered_deoptimizations_handle); 879 CodeInstaller installer(compiled_code_handle, result, cb, installed_code_handle, triggered_deoptimizations_handle);
880 880
881 if (PrintCodeCacheOnCompilation) { 881 if (PrintCodeCacheOnCompilation) {
882 stringStream s; 882 stringStream s;
883 // Dump code cache into a buffer before locking the tty, 883 // Dump code cache into a buffer before locking the tty,
884 { 884 {
1155 #define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;" 1155 #define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;"
1156 #define HS_RESOLVED_TYPE "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedObjectType;" 1156 #define HS_RESOLVED_TYPE "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedObjectType;"
1157 #define HS_RESOLVED_JAVA_TYPE "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaType;" 1157 #define HS_RESOLVED_JAVA_TYPE "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaType;"
1158 #define HS_RESOLVED_METHOD "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod;" 1158 #define HS_RESOLVED_METHOD "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod;"
1159 #define HS_RESOLVED_FIELD "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaField;" 1159 #define HS_RESOLVED_FIELD "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaField;"
1160 #define HS_COMP_RESULT "Lcom/oracle/graal/hotspot/HotSpotCompilationResult;" 1160 #define HS_COMPILED_CODE "Lcom/oracle/graal/hotspot/HotSpotCompiledCode;"
1161 #define HS_CONFIG "Lcom/oracle/graal/hotspot/HotSpotVMConfig;" 1161 #define HS_CONFIG "Lcom/oracle/graal/hotspot/HotSpotVMConfig;"
1162 #define HS_METHOD "Lcom/oracle/graal/hotspot/meta/HotSpotMethod;" 1162 #define HS_METHOD "Lcom/oracle/graal/hotspot/meta/HotSpotMethod;"
1163 #define HS_INSTALLED_CODE "Lcom/oracle/graal/hotspot/meta/HotSpotInstalledCode;" 1163 #define HS_INSTALLED_CODE "Lcom/oracle/graal/hotspot/meta/HotSpotInstalledCode;"
1164 #define METHOD_DATA "Lcom/oracle/graal/hotspot/meta/HotSpotMethodData;" 1164 #define METHOD_DATA "Lcom/oracle/graal/hotspot/meta/HotSpotMethodData;"
1165 #define METASPACE_METHOD "J" 1165 #define METASPACE_METHOD "J"
1198 {CC"getResolvedType", CC"("CLASS")"RESOLVED_TYPE, FN_PTR(getResolvedType)}, 1198 {CC"getResolvedType", CC"("CLASS")"RESOLVED_TYPE, FN_PTR(getResolvedType)},
1199 {CC"getMetaspaceMethod", CC"("REFLECT_METHOD"["HS_RESOLVED_TYPE")"METASPACE_METHOD, FN_PTR(getMetaspaceMethod)}, 1199 {CC"getMetaspaceMethod", CC"("REFLECT_METHOD"["HS_RESOLVED_TYPE")"METASPACE_METHOD, FN_PTR(getMetaspaceMethod)},
1200 {CC"getMetaspaceConstructor", CC"("REFLECT_CONSTRUCTOR"["HS_RESOLVED_TYPE")"METASPACE_METHOD, FN_PTR(getMetaspaceConstructor)}, 1200 {CC"getMetaspaceConstructor", CC"("REFLECT_CONSTRUCTOR"["HS_RESOLVED_TYPE")"METASPACE_METHOD, FN_PTR(getMetaspaceConstructor)},
1201 {CC"getJavaField", CC"("REFLECT_FIELD")"HS_RESOLVED_FIELD, FN_PTR(getJavaField)}, 1201 {CC"getJavaField", CC"("REFLECT_FIELD")"HS_RESOLVED_FIELD, FN_PTR(getJavaField)},
1202 {CC"initializeConfiguration", CC"("HS_CONFIG")V", FN_PTR(initializeConfiguration)}, 1202 {CC"initializeConfiguration", CC"("HS_CONFIG")V", FN_PTR(initializeConfiguration)},
1203 {CC"installCode0", CC"("HS_COMP_RESULT HS_INSTALLED_CODE"[Z)I", FN_PTR(installCode0)}, 1203 {CC"installCode0", CC"("HS_COMPILED_CODE HS_INSTALLED_CODE"[Z)I", FN_PTR(installCode0)},
1204 {CC"getCode", CC"(J)[B", FN_PTR(getCode)}, 1204 {CC"getCode", CC"(J)[B", FN_PTR(getCode)},
1205 {CC"disassembleCodeBlob", CC"(J)"STRING, FN_PTR(disassembleCodeBlob)}, 1205 {CC"disassembleCodeBlob", CC"(J)"STRING, FN_PTR(disassembleCodeBlob)},
1206 {CC"executeCompiledMethodVarargs", CC"(["OBJECT NMETHOD")"OBJECT, FN_PTR(executeCompiledMethodVarargs)}, 1206 {CC"executeCompiledMethodVarargs", CC"(["OBJECT NMETHOD")"OBJECT, FN_PTR(executeCompiledMethodVarargs)},
1207 {CC"getDeoptedLeafGraphIds", CC"()[J", FN_PTR(getDeoptedLeafGraphIds)}, 1207 {CC"getDeoptedLeafGraphIds", CC"()[J", FN_PTR(getDeoptedLeafGraphIds)},
1208 {CC"getLineNumberTable", CC"("HS_RESOLVED_METHOD")[J", FN_PTR(getLineNumberTable)}, 1208 {CC"getLineNumberTable", CC"("HS_RESOLVED_METHOD")[J", FN_PTR(getLineNumberTable)},