Mercurial > hg > truffle

comparison src/share/vm/graal/graalCompilerToVM.cpp @ 6363:a73fcf1639fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HotSpotVMConfig object is now allocated in Java
author Doug Simon <doug.simon@oracle.com>
date Wed, 12 Sep 2012 12:45:46 +0200
parents 908e40db1d94
children cc402f4396f4
comparison
equal deleted inserted replaced
6362:6d232ee6a62d 6363:a73fcf1639fc
705 705
706 706
707 BasicType basicTypes[] = { T_BOOLEAN, T_BYTE, T_SHORT, T_CHAR, T_INT, T_FLOAT, T_LONG, T_DOUBLE, T_OBJECT }; 707 BasicType basicTypes[] = { T_BOOLEAN, T_BYTE, T_SHORT, T_CHAR, T_INT, T_FLOAT, T_LONG, T_DOUBLE, T_OBJECT };
708 int basicTypeCount = sizeof(basicTypes) / sizeof(BasicType); 708 int basicTypeCount = sizeof(basicTypes) / sizeof(BasicType);
709 709
710 // public HotSpotVMConfig getConfiguration(); 710 // public void initializeConfiguration(HotSpotVMConfig config);
711 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getConfiguration(JNIEnv *env, jobject) { 711 JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_initializeConfiguration(JNIEnv *env, jobject, jobject config) {
712 jclass klass = env->FindClass("com/oracle/graal/hotspot/HotSpotVMConfig");
713 assert(klass != NULL, "HotSpot vm config class not found");
714 jobject config = env->AllocObject(klass);
715 #ifdef _WIN64 712 #ifdef _WIN64
716 set_boolean(env, config, "windowsOs", true); 713 set_boolean(env, config, "windowsOs", true);
717 #else 714 #else
718 set_boolean(env, config, "windowsOs", false); 715 set_boolean(env, config, "windowsOs", false);
719 #endif 716 #endif
806 ShouldNotReachHere(); 803 ShouldNotReachHere();
807 break; 804 break;
808 } 805 }
809 806
810 set_int(env, config, "arrayClassElementOffset", in_bytes(objArrayKlass::element_klass_offset())); 807 set_int(env, config, "arrayClassElementOffset", in_bytes(objArrayKlass::element_klass_offset()));
811 return config;
812 } 808 }
813 809
814 // public HotSpotCompiledMethod installMethod(HotSpotCompilationResult comp, boolean installCode); 810 // public HotSpotCompiledMethod installMethod(HotSpotCompilationResult comp, boolean installCode);
815 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject compResult, jboolean install_code, jobject info) { 811 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject compResult, jboolean install_code, jobject info) {
816 VM_ENTRY_MARK; 812 VM_ENTRY_MARK;
1043 {CC"JavaType_fields", CC"("RESOLVED_TYPE")["RESOLVED_FIELD, FN_PTR(JavaType_1fields)}, 1039 {CC"JavaType_fields", CC"("RESOLVED_TYPE")["RESOLVED_FIELD, FN_PTR(JavaType_1fields)},
1044 {CC"JavaType_isInitialized", CC"("RESOLVED_TYPE")Z", FN_PTR(JavaType_1isInitialized)}, 1040 {CC"JavaType_isInitialized", CC"("RESOLVED_TYPE")Z", FN_PTR(JavaType_1isInitialized)},
1045 {CC"getPrimitiveArrayType", CC"("KIND")"TYPE, FN_PTR(getPrimitiveArrayType)}, 1041 {CC"getPrimitiveArrayType", CC"("KIND")"TYPE, FN_PTR(getPrimitiveArrayType)},
1046 {CC"getMaxCallTargetOffset", CC"("RUNTIME_CALL")J", FN_PTR(getMaxCallTargetOffset)}, 1042 {CC"getMaxCallTargetOffset", CC"("RUNTIME_CALL")J", FN_PTR(getMaxCallTargetOffset)},
1047 {CC"getType", CC"("CLASS")"TYPE, FN_PTR(getType)}, 1043 {CC"getType", CC"("CLASS")"TYPE, FN_PTR(getType)},
1048 {CC"getConfiguration", CC"()"CONFIG, FN_PTR(getConfiguration)}, 1044 {CC"initializeConfiguration", CC"("CONFIG")V", FN_PTR(initializeConfiguration)},
1049 {CC"installMethod", CC"("HS_COMP_RESULT"Z"HS_CODE_INFO")"HS_COMP_METHOD, FN_PTR(installMethod)}, 1045 {CC"installMethod", CC"("HS_COMP_RESULT"Z"HS_CODE_INFO")"HS_COMP_METHOD, FN_PTR(installMethod)},
1050 {CC"disassembleNative", CC"([BJ)"STRING, FN_PTR(disassembleNative)}, 1046 {CC"disassembleNative", CC"([BJ)"STRING, FN_PTR(disassembleNative)},
1051 {CC"JavaMethod_toStackTraceElement", CC"("RESOLVED_METHOD"I)"STACK_TRACE_ELEMENT, FN_PTR(JavaMethod_1toStackTraceElement)}, 1047 {CC"JavaMethod_toStackTraceElement", CC"("RESOLVED_METHOD"I)"STACK_TRACE_ELEMENT, FN_PTR(JavaMethod_1toStackTraceElement)},
1052 {CC"executeCompiledMethod", CC"("HS_COMP_METHOD OBJECT OBJECT OBJECT")"OBJECT, FN_PTR(executeCompiledMethod)}, 1048 {CC"executeCompiledMethod", CC"("HS_COMP_METHOD OBJECT OBJECT OBJECT")"OBJECT, FN_PTR(executeCompiledMethod)},
1053 {CC"executeCompiledMethodVarargs", CC"("HS_COMP_METHOD "["OBJECT")"OBJECT, FN_PTR(executeCompiledMethodVarargs)}, 1049 {CC"executeCompiledMethodVarargs", CC"("HS_COMP_METHOD "["OBJECT")"OBJECT, FN_PTR(executeCompiledMethodVarargs)},