1.1 --- a/src/share/vm/classfile/vmSymbols.hpp Fri Jul 17 00:50:55 2009 -0700
1.2 +++ b/src/share/vm/classfile/vmSymbols.hpp Tue Jul 21 16:56:06 2009 -0700
1.3 @@ -513,9 +513,6 @@
1.4 //
1.5 // for Emacs: (let ((c-backslash-column 120) (c-backslash-max-column 120)) (c-backslash-region (point) (point-max) nil t))
1.6 #define VM_INTRINSICS_DO(do_intrinsic, do_class, do_name, do_signature, do_alias) \
1.7 - do_intrinsic(_Object_init, java_lang_Object, object_initializer_name, void_method_signature, F_R) \
1.8 - /* (symbol object_initializer_name defined above) */ \
1.9 - \
1.10 do_intrinsic(_hashCode, java_lang_Object, hashCode_name, void_int_signature, F_R) \
1.11 do_name( hashCode_name, "hashCode") \
1.12 do_intrinsic(_getClass, java_lang_Object, getClass_name, void_class_signature, F_R) \
1.13 @@ -635,9 +632,6 @@
1.14 do_intrinsic(_equalsC, java_util_Arrays, equals_name, equalsC_signature, F_S) \
1.15 do_signature(equalsC_signature, "([C[C)Z") \
1.16 \
1.17 - do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_array_object_object_signature, F_R) \
1.18 - /* (symbols invoke_name and invoke_signature defined above) */ \
1.19 - \
1.20 do_intrinsic(_compareTo, java_lang_String, compareTo_name, string_int_signature, F_R) \
1.21 do_name( compareTo_name, "compareTo") \
1.22 do_intrinsic(_indexOf, java_lang_String, indexOf_name, string_int_signature, F_R) \
1.23 @@ -656,8 +650,6 @@
1.24 do_name( attemptUpdate_name, "attemptUpdate") \
1.25 do_signature(attemptUpdate_signature, "(JJ)Z") \
1.26 \
1.27 - do_intrinsic(_fillInStackTrace, java_lang_Throwable, fillInStackTrace_name, void_throwable_signature, F_RNY) \
1.28 - \
1.29 /* support for sun.misc.Unsafe */ \
1.30 do_class(sun_misc_Unsafe, "sun/misc/Unsafe") \
1.31 \
1.32 @@ -819,10 +811,22 @@
1.33 do_name( prefetchReadStatic_name, "prefetchReadStatic") \
1.34 do_intrinsic(_prefetchWriteStatic, sun_misc_Unsafe, prefetchWriteStatic_name, prefetch_signature, F_SN) \
1.35 do_name( prefetchWriteStatic_name, "prefetchWriteStatic") \
1.36 + /*== LAST_COMPILER_INLINE*/ \
1.37 + /*the compiler does have special inlining code for these; bytecode inline is just fine */ \
1.38 + \
1.39 + do_intrinsic(_fillInStackTrace, java_lang_Throwable, fillInStackTrace_name, void_throwable_signature, F_RNY) \
1.40 + \
1.41 + do_intrinsic(_Object_init, java_lang_Object, object_initializer_name, void_method_signature, F_R) \
1.42 + /* (symbol object_initializer_name defined above) */ \
1.43 + \
1.44 + do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_array_object_object_signature, F_R) \
1.45 + /* (symbols invoke_name and invoke_signature defined above) */ \
1.46 + \
1.47 /*end*/
1.48
1.49
1.50
1.51 +
1.52 // Class vmSymbols
1.53
1.54 class vmSymbols: AllStatic {
1.55 @@ -935,6 +939,7 @@
1.56 #undef VM_INTRINSIC_ENUM
1.57
1.58 ID_LIMIT,
1.59 + LAST_COMPILER_INLINE = _prefetchWriteStatic,
1.60 FIRST_ID = _none + 1
1.61 };
1.62
1.63 @@ -972,4 +977,7 @@
1.64 static Flags flags_for(ID id);
1.65
1.66 static const char* short_name_as_C_string(ID id, char* buf, int size);
1.67 +
1.68 + // Access to intrinsic methods:
1.69 + static methodOop method_for(ID id);
1.70 };
