comparison src/share/vm/jvmci/jvmciCompilerToVM.cpp @ 22672:1bbd4a7c274b

Rename jdk.internal.jvmci to jdk.vm.ci
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 08 Oct 2015 17:28:41 -0700
parents d06159da32c7
children ea58bbafd5b9
comparison
equal deleted inserted replaced
22671:97f30e4d0e95 22672:1bbd4a7c274b
724 ResourceMark rm; 724 ResourceMark rm;
725 HandleMark hm; 725 HandleMark hm;
726 726
727 jlong nmethodValue = InstalledCode::address(hotspotInstalledCode); 727 jlong nmethodValue = InstalledCode::address(hotspotInstalledCode);
728 if (nmethodValue == 0L) { 728 if (nmethodValue == 0L) {
729 THROW_NULL(vmSymbols::jdk_internal_jvmci_code_InvalidInstalledCodeException()); 729 THROW_NULL(vmSymbols::jdk_vm_ci_code_InvalidInstalledCodeException());
730 } 730 }
731 nmethod* nm = (nmethod*) (address) nmethodValue; 731 nmethod* nm = (nmethod*) (address) nmethodValue;
732 methodHandle mh = nm->method(); 732 methodHandle mh = nm->method();
733 Symbol* signature = mh->signature(); 733 Symbol* signature = mh->signature();
734 JavaCallArguments jca(mh->size_of_parameters()); 734 JavaCallArguments jca(mh->size_of_parameters());
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/internal/jvmci/meta/SpeculationLog;" 1199 #define SPECULATION_LOG "Ljdk/vm/ci/meta/SpeculationLog;"
1200 #define STRING "Ljava/lang/String;" 1200 #define STRING "Ljava/lang/String;"
1201 #define OBJECT "Ljava/lang/Object;" 1201 #define OBJECT "Ljava/lang/Object;"
1202 #define CLASS "Ljava/lang/Class;" 1202 #define CLASS "Ljava/lang/Class;"
1203 #define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;" 1203 #define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;"
1204 #define INSTALLED_CODE "Ljdk/internal/jvmci/code/InstalledCode;" 1204 #define INSTALLED_CODE "Ljdk/vm/ci/code/InstalledCode;"
1205 #define TARGET_DESCRIPTION "Ljdk/internal/jvmci/code/TargetDescription;" 1205 #define TARGET_DESCRIPTION "Ljdk/vm/ci/code/TargetDescription;"
1206 #define RESOLVED_METHOD "Ljdk/internal/jvmci/meta/ResolvedJavaMethod;" 1206 #define RESOLVED_METHOD "Ljdk/vm/ci/meta/ResolvedJavaMethod;"
1207 #define HS_RESOLVED_METHOD "Ljdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethodImpl;" 1207 #define HS_RESOLVED_METHOD "Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;"
1208 #define HS_RESOLVED_KLASS "Ljdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl;" 1208 #define HS_RESOLVED_KLASS "Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;"
1209 #define HS_CONSTANT_POOL "Ljdk/internal/jvmci/hotspot/HotSpotConstantPool;" 1209 #define HS_CONSTANT_POOL "Ljdk/vm/ci/hotspot/HotSpotConstantPool;"
1210 #define HS_COMPILED_CODE "Ljdk/internal/jvmci/hotspot/HotSpotCompiledCode;" 1210 #define HS_COMPILED_CODE "Ljdk/vm/ci/hotspot/HotSpotCompiledCode;"
1211 #define HS_CONFIG "Ljdk/internal/jvmci/hotspot/HotSpotVMConfig;" 1211 #define HS_CONFIG "Ljdk/vm/ci/hotspot/HotSpotVMConfig;"
1212 #define HS_STACK_FRAME_REF "Ljdk/internal/jvmci/hotspot/HotSpotStackFrameReference;" 1212 #define HS_STACK_FRAME_REF "Ljdk/vm/ci/hotspot/HotSpotStackFrameReference;"
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)},