truffle: src/share/vm/prims/jvm.cpp comparison

comparison src/share/vm/prims/jvm.cpp @ 1144:9b9c1ee9b3f6

Merge

author	iveresov
date	Wed, 06 Jan 2010 22:21:39 -0800
parents	933a3e806ce6 4ce7240d622c
children	e392695de029

comparison

equal deleted inserted replaced

-:a5a6adfca6ec
+:9b9c1ee9b3f6
 methodOop last_caller = NULL;
 while (!vfst.at_end()) {
 methodOop m = vfst.method();
-if (!vfst.method()->method_holder()->klass_part()->is_subclass_of(SystemDictionary::classloader_klass())&&
+if (!vfst.method()->method_holder()->klass_part()->is_subclass_of(SystemDictionary::ClassLoader_klass())&&
 !vfst.method()->method_holder()->klass_part()->is_subclass_of(access_controller_klass) &&
 !vfst.method()->method_holder()->klass_part()->is_subclass_of(privileged_action_klass)) {
 break;
 }
 last_caller = m;
 HandleMark hm(THREAD);
 Handle key_str    = java_lang_String::create_from_platform_dependent_str(key, CHECK);
 Handle value_str  = java_lang_String::create_from_platform_dependent_str((value != NULL ? value : ""), CHECK);
 JavaCalls::call_virtual(&r,
 props,
-KlassHandle(THREAD, SystemDictionary::properties_klass()),
+KlassHandle(THREAD, SystemDictionary::Properties_klass()),
 vmSymbolHandles::put_name(),
 vmSymbolHandles::object_object_object_signature(),
 key_str,
 value_str,
 THREAD);
 // Just checking that the cloneable flag is set correct
 if (obj->is_javaArray()) {
 guarantee(klass->is_cloneable(), "all arrays are cloneable");
 } else {
 guarantee(obj->is_instance(), "should be instanceOop");
-bool cloneable = klass->is_subtype_of(SystemDictionary::cloneable_klass());
+bool cloneable = klass->is_subtype_of(SystemDictionary::Cloneable_klass());
 guarantee(cloneable == klass->is_cloneable(), "incorrect cloneable flag");
 }
 #endif
 // Check if class of obj supports the Cloneable interface.
 oop mirror = JNIHandles::resolve_non_null(cls);
 // Special handling for primitive objects
 if (java_lang_Class::is_primitive(mirror)) {
 // Primitive objects does not have any interfaces
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL);
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL);
 return (jobjectArray) JNIHandles::make_local(env, r);
 }
 KlassHandle klass(thread, java_lang_Class::as_klassOop(mirror));
 // Figure size of result array
 assert(klass->oop_is_objArray() || klass->oop_is_typeArray(), "Illegal mirror klass");
 size = 2;
 }
 // Allocate result array
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), size, CHECK_NULL);
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), size, CHECK_NULL);
 objArrayHandle result (THREAD, r);
 // Fill in result
 if (klass->oop_is_instance()) {
 // Regular instance klass, fill in all local interfaces
 for (int index = 0; index < size; index++) {
 klassOop k = klassOop(instanceKlass::cast(klass())->local_interfaces()->obj_at(index));
 result->obj_at_put(index, Klass::cast(k)->java_mirror());
 }
 } else {
 // All arrays implement java.lang.Cloneable and java.io.Serializable
-result->obj_at_put(0, Klass::cast(SystemDictionary::cloneable_klass())->java_mirror());
+result->obj_at_put(0, Klass::cast(SystemDictionary::Cloneable_klass())->java_mirror());
-result->obj_at_put(1, Klass::cast(SystemDictionary::serializable_klass())->java_mirror());
+result->obj_at_put(1, Klass::cast(SystemDictionary::Serializable_klass())->java_mirror());
 }
 return (jobjectArray) JNIHandles::make_local(env, result());
 JVM_END
 if (HAS_PENDING_EXCEPTION) {
 pending_exception = Handle(THREAD, PENDING_EXCEPTION);
 CLEAR_PENDING_EXCEPTION;
-if ( pending_exception->is_a(SystemDictionary::exception_klass()) &&
+if ( pending_exception->is_a(SystemDictionary::Exception_klass()) &&
-!pending_exception->is_a(SystemDictionary::runtime_exception_klass())) {
+!pending_exception->is_a(SystemDictionary::RuntimeException_klass())) {
 // Throw a java.security.PrivilegedActionException(Exception e) exception
 JavaCallArguments args(pending_exception);
 THROW_ARG_0(vmSymbolHandles::java_security_PrivilegedActionException(),
 vmSymbolHandles::exception_void_signature(),
 &args);
 return JNIHandles::make_local(env, result);
 }
 // the resource area must be registered in case of a gc
 RegisterArrayForGC ragc(thread, local_array);
-objArrayOop context = oopFactory::new_objArray(SystemDictionary::protectionDomain_klass(),
+objArrayOop context = oopFactory::new_objArray(SystemDictionary::ProtectionDomain_klass(),
 local_array->length(), CHECK_NULL);
 objArrayHandle h_context(thread, context);
 for (int index = 0; index < local_array->length(); index++) {
 h_context->obj_at_put(index, local_array->at(index));
 }
 // ofClass is a reference to a java_lang_Class object. The mirror object
 // of an instanceKlass
 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) ||
 ! Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_instance()) {
-oop result = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL);
+oop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL);
 return (jobjectArray)JNIHandles::make_local(env, result);
 }
 instanceKlassHandle k(thread, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)));
 if (k->inner_classes()->length() == 0) {
 // Neither an inner nor outer class
-oop result = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL);
+oop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL);
 return (jobjectArray)JNIHandles::make_local(env, result);
 }
 // find inner class info
 typeArrayHandle    icls(thread, k->inner_classes());
 constantPoolHandle cp(thread, k->constants());
 int length = icls->length();
 // Allocate temp. result array
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), length/4, CHECK_NULL);
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), length/4, CHECK_NULL);
 objArrayHandle result (THREAD, r);
 int members = 0;
 for(int i = 0; i < length; i += 4) {
 int ioff = icls->ushort_at(i + inner_class_info_index);
 }
 }
 if (members != length) {
 // Return array of right length
-objArrayOop res = oopFactory::new_objArray(SystemDictionary::class_klass(), members, CHECK_NULL);
+objArrayOop res = oopFactory::new_objArray(SystemDictionary::Class_klass(), members, CHECK_NULL);
 for(int i = 0; i < members; i++) {
 res->obj_at_put(i, result->obj_at(i));
 }
 return (jobjectArray)JNIHandles::make_local(env, res);
 }
 oop reflected = JNIHandles::resolve_non_null(method);
 oop mirror    = NULL;
 int slot      = 0;
-if (reflected->klass() == SystemDictionary::reflect_constructor_klass()) {
+if (reflected->klass() == SystemDictionary::reflect_Constructor_klass()) {
 mirror = java_lang_reflect_Constructor::clazz(reflected);
 slot   = java_lang_reflect_Constructor::slot(reflected);
 } else {
-assert(reflected->klass() == SystemDictionary::reflect_method_klass(),
+assert(reflected->klass() == SystemDictionary::reflect_Method_klass(),
 "wrong type");
 mirror = java_lang_reflect_Method::clazz(reflected);
 slot   = java_lang_reflect_Method::slot(reflected);
 }
 klassOop k = java_lang_Class::as_klassOop(mirror);
 // Exclude primitive types and array types
 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) ||
 Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) {
 // Return empty array
-oop res = oopFactory::new_objArray(SystemDictionary::reflect_field_klass(), 0, CHECK_NULL);
+oop res = oopFactory::new_objArray(SystemDictionary::reflect_Field_klass(), 0, CHECK_NULL);
 return (jobjectArray) JNIHandles::make_local(env, res);
 }
 instanceKlassHandle k(THREAD, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)));
 constantPoolHandle cp(THREAD, k->constants());
 if (mods & JVM_ACC_PUBLIC) ++num_fields;
 }
 } else {
 num_fields = fields_len / instanceKlass::next_offset;
-if (k() == SystemDictionary::throwable_klass()) {
+if (k() == SystemDictionary::Throwable_klass()) {
 num_fields--;
 skip_backtrace = true;
 }
 }
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_field_klass(), num_fields, CHECK_NULL);
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Field_klass(), num_fields, CHECK_NULL);
 objArrayHandle result (THREAD, r);
 int out_idx = 0;
 fieldDescriptor fd;
 for (int i = 0; i < fields_len; i += instanceKlass::next_offset) {
 // Exclude primitive types and array types
 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass))
 || Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) {
 // Return empty array
-oop res = oopFactory::new_objArray(SystemDictionary::reflect_method_klass(), 0, CHECK_NULL);
+oop res = oopFactory::new_objArray(SystemDictionary::reflect_Method_klass(), 0, CHECK_NULL);
 return (jobjectArray) JNIHandles::make_local(env, res);
 }
 instanceKlassHandle k(THREAD, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)));
 }
 }
 }
 // Allocate result
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_method_klass(), num_methods, CHECK_NULL);
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Method_klass(), num_methods, CHECK_NULL);
 objArrayHandle result (THREAD, r);
 int out_idx = 0;
 for (i = 0; i < methods_length; i++) {
 methodHandle method(THREAD, (methodOop) methods->obj_at(i));
 // Exclude primitive types and array types
 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass))
 || Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) {
 // Return empty array
-oop res = oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), 0 , CHECK_NULL);
+oop res = oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), 0 , CHECK_NULL);
 return (jobjectArray) JNIHandles::make_local(env, res);
 }
 instanceKlassHandle k(THREAD, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)));
 }
 }
 }
 // Allocate result
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), num_constructors, CHECK_NULL);
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), num_constructors, CHECK_NULL);
 objArrayHandle result(THREAD, r);
 int out_idx = 0;
 for (i = 0; i < methods_length; i++) {
 methodHandle method(THREAD, (methodOop) methods->obj_at(i));
 }
 int klass_ref = cp->uncached_klass_ref_index_at(index);
 symbolHandle klass_name (THREAD, cp->klass_name_at(klass_ref));
 symbolHandle member_name(THREAD, cp->uncached_name_ref_at(index));
 symbolHandle member_sig (THREAD, cp->uncached_signature_ref_at(index));
-objArrayOop  dest_o = oopFactory::new_objArray(SystemDictionary::string_klass(), 3, CHECK_NULL);
+objArrayOop  dest_o = oopFactory::new_objArray(SystemDictionary::String_klass(), 3, CHECK_NULL);
 objArrayHandle dest(THREAD, dest_o);
 Handle str = java_lang_String::create_from_symbol(klass_name, CHECK_NULL);
 dest->obj_at_put(0, str());
 str = java_lang_String::create_from_symbol(member_name, CHECK_NULL);
 dest->obj_at_put(1, str());
 HandleMark hm(THREAD);
 Handle obj(THREAD, thread->threadObj());
 JavaValue result(T_VOID);
 JavaCalls::call_virtual(&result,
 obj,
-KlassHandle(THREAD, SystemDictionary::thread_klass()),
+KlassHandle(THREAD, SystemDictionary::Thread_klass()),
 vmSymbolHandles::run_method_name(),
 vmSymbolHandles::void_method_signature(),
 THREAD);
 }
 // NOTE (from JDK 1.2): this is done solely to prevent stopped
 // threads from being restarted.
 // Fix for 4314342, 4145910, perhaps others: it now doesn't have
 // any effect on the "liveness" of a thread; see
 // JVM_IsThreadAlive, below.
-if (java_throwable->is_a(SystemDictionary::threaddeath_klass())) {
+if (java_throwable->is_a(SystemDictionary::ThreadDeath_klass())) {
 java_lang_Thread::set_stillborn(java_thread);
 }
 THROW_OOP(java_throwable);
 } else {
 // Enques a VM_Operation to stop all threads and then deliver the exception...
 }
 }
 }
 // Create result array of type [Ljava/lang/Class;
-objArrayOop result = oopFactory::new_objArray(SystemDictionary::class_klass(), depth, CHECK_NULL);
+objArrayOop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), depth, CHECK_NULL);
 // Fill in mirrors corresponding to method holders
 int index = 0;
 while (first != NULL) {
 result->obj_at_put(index++, Klass::cast(first->klass())->java_mirror());
 first = first->next;
 ResourceMark rm(THREAD);
 ThreadsListEnumerator tle(THREAD, false, false);
 JvmtiVMObjectAllocEventCollector oam;
 int num_threads = tle.num_threads();
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::thread_klass(), num_threads, CHECK_NULL);
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::Thread_klass(), num_threads, CHECK_NULL);
 objArrayHandle threads_ah(THREAD, r);
 for (int i = 0; i < num_threads; i++) {
 Handle h = tle.get_threadObj(i);
 threads_ah->obj_at_put(i, h());
 THROW_(vmSymbols::java_lang_IllegalArgumentException(), 0);
 }
 // check if threads is not an array of objects of Thread class
 klassOop k = objArrayKlass::cast(ah->klass())->element_klass();
-if (k != SystemDictionary::thread_klass()) {
+if (k != SystemDictionary::Thread_klass()) {
 THROW_(vmSymbols::java_lang_IllegalArgumentException(), 0);
 }
 ResourceMark rm(THREAD);
 instanceKlassHandle ik_h(THREAD, k);
 int encl_method_class_idx = ik_h->enclosing_method_class_index();
 if (encl_method_class_idx == 0) {
 return NULL;
 }
-objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::object_klass(), 3, CHECK_NULL);
+objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::Object_klass(), 3, CHECK_NULL);
 objArrayHandle dest(THREAD, dest_o);
 klassOop enc_k = ik_h->constants()->klass_at(encl_method_class_idx, CHECK_NULL);
 dest->obj_at_put(0, Klass::cast(enc_k)->java_mirror());
 int encl_method_method_idx = ik_h->enclosing_method_method_index();
 if (encl_method_method_idx != 0) {
 case JAVA_THREAD_STATE_NEW : {
 assert(values_h->length() == 1 &&
 values_h->int_at(0) == java_lang_Thread::NEW,
 "Invalid threadStatus value");
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
 1, /* only 1 substate */
 CHECK_NULL);
 names_h = objArrayHandle(THREAD, r);
 Handle name = java_lang_String::create_from_str("NEW", CHECK_NULL);
 names_h->obj_at_put(0, name());
 case JAVA_THREAD_STATE_RUNNABLE : {
 assert(values_h->length() == 1 &&
 values_h->int_at(0) == java_lang_Thread::RUNNABLE,
 "Invalid threadStatus value");
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
 1, /* only 1 substate */
 CHECK_NULL);
 names_h = objArrayHandle(THREAD, r);
 Handle name = java_lang_String::create_from_str("RUNNABLE", CHECK_NULL);
 names_h->obj_at_put(0, name());
 case JAVA_THREAD_STATE_BLOCKED : {
 assert(values_h->length() == 1 &&
 values_h->int_at(0) == java_lang_Thread::BLOCKED_ON_MONITOR_ENTER,
 "Invalid threadStatus value");
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
 1, /* only 1 substate */
 CHECK_NULL);
 names_h = objArrayHandle(THREAD, r);
 Handle name = java_lang_String::create_from_str("BLOCKED", CHECK_NULL);
 names_h->obj_at_put(0, name());
 case JAVA_THREAD_STATE_WAITING : {
 assert(values_h->length() == 2 &&
 values_h->int_at(0) == java_lang_Thread::IN_OBJECT_WAIT &&
 values_h->int_at(1) == java_lang_Thread::PARKED,
 "Invalid threadStatus value");
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
 2, /* number of substates */
 CHECK_NULL);
 names_h = objArrayHandle(THREAD, r);
 Handle name0 = java_lang_String::create_from_str("WAITING.OBJECT_WAIT",
 CHECK_NULL);
 assert(values_h->length() == 3 &&
 values_h->int_at(0) == java_lang_Thread::SLEEPING &&
 values_h->int_at(1) == java_lang_Thread::IN_OBJECT_WAIT_TIMED &&
 values_h->int_at(2) == java_lang_Thread::PARKED_TIMED,
 "Invalid threadStatus value");
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
 3, /* number of substates */
 CHECK_NULL);
 names_h = objArrayHandle(THREAD, r);
 Handle name0 = java_lang_String::create_from_str("TIMED_WAITING.SLEEPING",
 CHECK_NULL);
 }
 case JAVA_THREAD_STATE_TERMINATED : {
 assert(values_h->length() == 1 &&
 values_h->int_at(0) == java_lang_Thread::TERMINATED,
 "Invalid threadStatus value");
-objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
 1, /* only 1 substate */
 CHECK_NULL);
 names_h = objArrayHandle(THREAD, r);
 Handle name = java_lang_String::create_from_str("TERMINATED", CHECK_NULL);
 names_h->obj_at_put(0, name());
 #else  // KERNEL
 info->is_kernel_jvm = 0; // false;
 #endif // KERNEL
 }
 JVM_END

Mercurial > hg > truffle

comparison src/share/vm/prims/jvm.cpp @ 1144:9b9c1ee9b3f6