comparison src/share/vm/graal/graalCompilerToVM.cpp @ 15169:0ba58961ba14

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Apr 2014 19:00:14 +0200
parents 7bc92bdfd322 6876a4599b7e
children 66e3af78ea96
comparison
equal deleted inserted replaced
15168:78530cbd8940 15169:0ba58961ba14
739 C2V_END 739 C2V_END
740 740
741 C2V_VMENTRY(jobject, getJavaMirror, (JNIEnv *env, jobject, jlong metaspace_klass)) 741 C2V_VMENTRY(jobject, getJavaMirror, (JNIEnv *env, jobject, jlong metaspace_klass))
742 Klass* klass = asKlass(metaspace_klass); 742 Klass* klass = asKlass(metaspace_klass);
743 return JNIHandles::make_local(klass->java_mirror()); 743 return JNIHandles::make_local(klass->java_mirror());
744 C2V_END
745
746 C2V_VMENTRY(void, setNodeClass, (JNIEnv *env, jobject, jobject java_class_handle, jobject value))
747 oop java_class = JNIHandles::resolve(java_class_handle);
748 InstanceKlass* iklass = (InstanceKlass*) java_lang_Class::as_Klass(java_class);
749 iklass->set_graal_node_class(JNIHandles::resolve(value));
750 C2V_END 744 C2V_END
751 745
752 C2V_VMENTRY(jlong, readUnsafeKlassPointer, (JNIEnv *env, jobject, jobject o)) 746 C2V_VMENTRY(jlong, readUnsafeKlassPointer, (JNIEnv *env, jobject, jobject o))
753 oop resolved_o = JNIHandles::resolve(o); 747 oop resolved_o = JNIHandles::resolve(o);
754 jlong klass = (jlong)(address)resolved_o->klass(); 748 jlong klass = (jlong)(address)resolved_o->klass();
1100 {CC"getLocalVariableTableStart", CC"("METASPACE_METHOD")J", FN_PTR(getLocalVariableTableStart)}, 1094 {CC"getLocalVariableTableStart", CC"("METASPACE_METHOD")J", FN_PTR(getLocalVariableTableStart)},
1101 {CC"getLocalVariableTableLength", CC"("METASPACE_METHOD")I", FN_PTR(getLocalVariableTableLength)}, 1095 {CC"getLocalVariableTableLength", CC"("METASPACE_METHOD")I", FN_PTR(getLocalVariableTableLength)},
1102 {CC"reprofile", CC"("METASPACE_METHOD")V", FN_PTR(reprofile)}, 1096 {CC"reprofile", CC"("METASPACE_METHOD")V", FN_PTR(reprofile)},
1103 {CC"invalidateInstalledCode", CC"("INSTALLED_CODE")V", FN_PTR(invalidateInstalledCode)}, 1097 {CC"invalidateInstalledCode", CC"("INSTALLED_CODE")V", FN_PTR(invalidateInstalledCode)},
1104 {CC"getJavaMirror", CC"("METASPACE_KLASS")"CLASS, FN_PTR(getJavaMirror)}, 1098 {CC"getJavaMirror", CC"("METASPACE_KLASS")"CLASS, FN_PTR(getJavaMirror)},
1105 {CC"setNodeClass", CC"("CLASS NODE_CLASS")V", FN_PTR(setNodeClass)},
1106 {CC"readUnsafeKlassPointer", CC"("OBJECT")J", FN_PTR(readUnsafeKlassPointer)}, 1099 {CC"readUnsafeKlassPointer", CC"("OBJECT")J", FN_PTR(readUnsafeKlassPointer)},
1107 {CC"collectCounters", CC"()[J", FN_PTR(collectCounters)}, 1100 {CC"collectCounters", CC"()[J", FN_PTR(collectCounters)},
1108 {CC"getGPUs", CC"()"STRING, FN_PTR(getGPUs)}, 1101 {CC"getGPUs", CC"()"STRING, FN_PTR(getGPUs)},
1109 {CC"allocateCompileId", CC"("METASPACE_METHOD"I)I", FN_PTR(allocateCompileId)}, 1102 {CC"allocateCompileId", CC"("METASPACE_METHOD"I)I", FN_PTR(allocateCompileId)},
1110 {CC"isMature", CC"("METASPACE_METHOD_DATA")Z", FN_PTR(isMature)}, 1103 {CC"isMature", CC"("METASPACE_METHOD_DATA")Z", FN_PTR(isMature)},