comparison src/share/vm/jvmci/jvmciCompilerToVM.cpp @ 22699:ea58bbafd5b9

Move SpeculationLog implementation to HotSpotSpeculationLog, because it is not useful for other VMs
author Christian Wimmer <christian.wimmer@oracle.com>
date Wed, 21 Oct 2015 09:06:12 -0700
parents 1bbd4a7c274b
children 6b1cd334f300
comparison
equal deleted inserted replaced
22698:37505a836aaf 22699:ea58bbafd5b9
1194 1194
1195 1195
1196 #define CC (char*) /*cast a literal from (const char*)*/ 1196 #define CC (char*) /*cast a literal from (const char*)*/
1197 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f)) 1197 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f))
1198 1198
1199 #define SPECULATION_LOG "Ljdk/vm/ci/meta/SpeculationLog;"
1200 #define STRING "Ljava/lang/String;" 1199 #define STRING "Ljava/lang/String;"
1201 #define OBJECT "Ljava/lang/Object;" 1200 #define OBJECT "Ljava/lang/Object;"
1202 #define CLASS "Ljava/lang/Class;" 1201 #define CLASS "Ljava/lang/Class;"
1203 #define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;" 1202 #define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;"
1204 #define INSTALLED_CODE "Ljdk/vm/ci/code/InstalledCode;" 1203 #define INSTALLED_CODE "Ljdk/vm/ci/code/InstalledCode;"
1208 #define HS_RESOLVED_KLASS "Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;" 1207 #define HS_RESOLVED_KLASS "Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;"
1209 #define HS_CONSTANT_POOL "Ljdk/vm/ci/hotspot/HotSpotConstantPool;" 1208 #define HS_CONSTANT_POOL "Ljdk/vm/ci/hotspot/HotSpotConstantPool;"
1210 #define HS_COMPILED_CODE "Ljdk/vm/ci/hotspot/HotSpotCompiledCode;" 1209 #define HS_COMPILED_CODE "Ljdk/vm/ci/hotspot/HotSpotCompiledCode;"
1211 #define HS_CONFIG "Ljdk/vm/ci/hotspot/HotSpotVMConfig;" 1210 #define HS_CONFIG "Ljdk/vm/ci/hotspot/HotSpotVMConfig;"
1212 #define HS_STACK_FRAME_REF "Ljdk/vm/ci/hotspot/HotSpotStackFrameReference;" 1211 #define HS_STACK_FRAME_REF "Ljdk/vm/ci/hotspot/HotSpotStackFrameReference;"
1212 #define HS_SPECULATION_LOG "Ljdk/vm/ci/hotspot/HotSpotSpeculationLog;"
1213 #define METASPACE_METHOD_DATA "J" 1213 #define METASPACE_METHOD_DATA "J"
1214 1214
1215 JNINativeMethod CompilerToVM::methods[] = { 1215 JNINativeMethod CompilerToVM::methods[] = {
1216 {CC"getBytecode", CC"("HS_RESOLVED_METHOD")[B", FN_PTR(getBytecode)}, 1216 {CC"getBytecode", CC"("HS_RESOLVED_METHOD")[B", FN_PTR(getBytecode)},
1217 {CC"getExceptionTableStart", CC"("HS_RESOLVED_METHOD")J", FN_PTR(getExceptionTableStart)}, 1217 {CC"getExceptionTableStart", CC"("HS_RESOLVED_METHOD")J", FN_PTR(getExceptionTableStart)},
1246 {CC"getResolvedJavaMethodAtSlot", CC"("CLASS"I)"HS_RESOLVED_METHOD, FN_PTR(getResolvedJavaMethodAtSlot)}, 1246 {CC"getResolvedJavaMethodAtSlot", CC"("CLASS"I)"HS_RESOLVED_METHOD, FN_PTR(getResolvedJavaMethodAtSlot)},
1247 {CC"getResolvedJavaMethod", CC"(Ljava/lang/Object;J)"HS_RESOLVED_METHOD, FN_PTR(getResolvedJavaMethod)}, 1247 {CC"getResolvedJavaMethod", CC"(Ljava/lang/Object;J)"HS_RESOLVED_METHOD, FN_PTR(getResolvedJavaMethod)},
1248 {CC"getConstantPool", CC"(Ljava/lang/Object;J)"HS_CONSTANT_POOL, FN_PTR(getConstantPool)}, 1248 {CC"getConstantPool", CC"(Ljava/lang/Object;J)"HS_CONSTANT_POOL, FN_PTR(getConstantPool)},
1249 {CC"getResolvedJavaType", CC"(Ljava/lang/Object;JZ)"HS_RESOLVED_KLASS, FN_PTR(getResolvedJavaType)}, 1249 {CC"getResolvedJavaType", CC"(Ljava/lang/Object;JZ)"HS_RESOLVED_KLASS, FN_PTR(getResolvedJavaType)},
1250 {CC"initializeConfiguration", CC"("HS_CONFIG")V", FN_PTR(initializeConfiguration)}, 1250 {CC"initializeConfiguration", CC"("HS_CONFIG")V", FN_PTR(initializeConfiguration)},
1251 {CC"installCode", CC"("TARGET_DESCRIPTION HS_COMPILED_CODE INSTALLED_CODE SPECULATION_LOG")I", FN_PTR(installCode)}, 1251 {CC"installCode", CC"("TARGET_DESCRIPTION HS_COMPILED_CODE INSTALLED_CODE HS_SPECULATION_LOG")I", FN_PTR(installCode)},
1252 {CC"notifyCompilationStatistics", CC"(I"HS_RESOLVED_METHOD"ZIJJ"INSTALLED_CODE")V", FN_PTR(notifyCompilationStatistics)}, 1252 {CC"notifyCompilationStatistics", CC"(I"HS_RESOLVED_METHOD"ZIJJ"INSTALLED_CODE")V", FN_PTR(notifyCompilationStatistics)},
1253 {CC"resetCompilationStatistics", CC"()V", FN_PTR(resetCompilationStatistics)}, 1253 {CC"resetCompilationStatistics", CC"()V", FN_PTR(resetCompilationStatistics)},
1254 {CC"disassembleCodeBlob", CC"("INSTALLED_CODE")"STRING, FN_PTR(disassembleCodeBlob)}, 1254 {CC"disassembleCodeBlob", CC"("INSTALLED_CODE")"STRING, FN_PTR(disassembleCodeBlob)},
1255 {CC"executeInstalledCode", CC"(["OBJECT INSTALLED_CODE")"OBJECT, FN_PTR(executeInstalledCode)}, 1255 {CC"executeInstalledCode", CC"(["OBJECT INSTALLED_CODE")"OBJECT, FN_PTR(executeInstalledCode)},
1256 {CC"getLineNumberTable", CC"("HS_RESOLVED_METHOD")[J", FN_PTR(getLineNumberTable)}, 1256 {CC"getLineNumberTable", CC"("HS_RESOLVED_METHOD")[J", FN_PTR(getLineNumberTable)},