comparison src/share/vm/prims/jvm.cpp @ 7969:1eae78177059

Merge
author jiangli
date Fri, 01 Feb 2013 15:25:37 -0500
parents 815957d0203e
children 24a91505f9d5
comparison
equal deleted inserted replaced
7968:44c5fcd9cb25 7969:1eae78177059
2300 Method* method = InstanceKlass::cast(k)->methods()->at(method_index); 2300 Method* method = InstanceKlass::cast(k)->methods()->at(method_index);
2301 return method->name() == vmSymbols::object_initializer_name(); 2301 return method->name() == vmSymbols::object_initializer_name();
2302 JVM_END 2302 JVM_END
2303 2303
2304 2304
2305 JVM_QUICK_ENTRY(jboolean, JVM_IsVMGeneratedMethodIx(JNIEnv *env, jclass cls, int method_index))
2306 JVMWrapper("JVM_IsVMGeneratedMethodIx");
2307 ResourceMark rm(THREAD);
2308 Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
2309 k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
2310 Method* method = InstanceKlass::cast(k)->methods()->at(method_index);
2311 return method->is_overpass();
2312 JVM_END
2313
2305 JVM_ENTRY(const char*, JVM_GetMethodIxNameUTF(JNIEnv *env, jclass cls, jint method_index)) 2314 JVM_ENTRY(const char*, JVM_GetMethodIxNameUTF(JNIEnv *env, jclass cls, jint method_index))
2306 JVMWrapper("JVM_GetMethodIxIxUTF"); 2315 JVMWrapper("JVM_GetMethodIxIxUTF");
2307 Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls)); 2316 Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
2308 k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread); 2317 k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
2309 Method* method = InstanceKlass::cast(k)->methods()->at(method_index); 2318 Method* method = InstanceKlass::cast(k)->methods()->at(method_index);
4517 4526
4518 // when we add a new capability in the jvm_version_info struct, we should also 4527 // when we add a new capability in the jvm_version_info struct, we should also
4519 // consider to expose this new capability in the sun.rt.jvmCapabilities jvmstat 4528 // consider to expose this new capability in the sun.rt.jvmCapabilities jvmstat
4520 // counter defined in runtimeService.cpp. 4529 // counter defined in runtimeService.cpp.
4521 info->is_attachable = AttachListener::is_attach_supported(); 4530 info->is_attachable = AttachListener::is_attach_supported();
4522 #ifdef KERNEL
4523 info->is_kernel_jvm = 1; // true;
4524 #else // KERNEL
4525 info->is_kernel_jvm = 0; // false; 4531 info->is_kernel_jvm = 0; // false;
4526 #endif // KERNEL 4532 }
4527 } 4533 JVM_END
4528 JVM_END