comparison src/share/vm/classfile/vmSymbols.hpp @ 4137:04b9a2566eec

Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents b648304ba4ff cb315dc80374
children feb590a8497f
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
216 template(override_name, "override") \ 216 template(override_name, "override") \
217 template(parameterTypes_name, "parameterTypes") \ 217 template(parameterTypes_name, "parameterTypes") \
218 template(returnType_name, "returnType") \ 218 template(returnType_name, "returnType") \
219 template(signature_name, "signature") \ 219 template(signature_name, "signature") \
220 template(slot_name, "slot") \ 220 template(slot_name, "slot") \
221 template(selectAlternative_name, "selectAlternative") \
221 \ 222 \
222 /* Support for annotations (JDK 1.5 and above) */ \ 223 /* Support for annotations (JDK 1.5 and above) */ \
223 \ 224 \
224 template(annotations_name, "annotations") \ 225 template(annotations_name, "annotations") \
225 template(parameter_annotations_name, "parameterAnnotations") \ 226 template(parameter_annotations_name, "parameterAnnotations") \
231 \ 232 \
232 /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \ 233 /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
233 template(java_lang_invoke_InvokeDynamic, "java/lang/invoke/InvokeDynamic") \ 234 template(java_lang_invoke_InvokeDynamic, "java/lang/invoke/InvokeDynamic") \
234 template(java_lang_invoke_Linkage, "java/lang/invoke/Linkage") \ 235 template(java_lang_invoke_Linkage, "java/lang/invoke/Linkage") \
235 template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \ 236 template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
237 template(java_lang_invoke_ConstantCallSite, "java/lang/invoke/ConstantCallSite") \
238 template(java_lang_invoke_MutableCallSite, "java/lang/invoke/MutableCallSite") \
239 template(java_lang_invoke_VolatileCallSite, "java/lang/invoke/VolatileCallSite") \
236 template(java_lang_invoke_MethodHandle, "java/lang/invoke/MethodHandle") \ 240 template(java_lang_invoke_MethodHandle, "java/lang/invoke/MethodHandle") \
237 template(java_lang_invoke_MethodType, "java/lang/invoke/MethodType") \ 241 template(java_lang_invoke_MethodType, "java/lang/invoke/MethodType") \
238 template(java_lang_invoke_WrongMethodTypeException, "java/lang/invoke/WrongMethodTypeException") \ 242 template(java_lang_invoke_WrongMethodTypeException, "java/lang/invoke/WrongMethodTypeException") \
239 template(java_lang_invoke_MethodType_signature, "Ljava/lang/invoke/MethodType;") \ 243 template(java_lang_invoke_MethodType_signature, "Ljava/lang/invoke/MethodType;") \
240 template(java_lang_invoke_MethodHandle_signature, "Ljava/lang/invoke/MethodHandle;") \ 244 template(java_lang_invoke_MethodHandle_signature, "Ljava/lang/invoke/MethodHandle;") \
241 /* internal classes known only to the JVM: */ \ 245 /* internal classes known only to the JVM: */ \
242 template(java_lang_invoke_MethodTypeForm, "java/lang/invoke/MethodTypeForm") \ 246 template(java_lang_invoke_MethodTypeForm, "java/lang/invoke/MethodTypeForm") \
243 template(java_lang_invoke_MethodTypeForm_signature, "Ljava/lang/invoke/MethodTypeForm;") \ 247 template(java_lang_invoke_MethodTypeForm_signature, "Ljava/lang/invoke/MethodTypeForm;") \
244 template(java_lang_invoke_MemberName, "java/lang/invoke/MemberName") \ 248 template(java_lang_invoke_MemberName, "java/lang/invoke/MemberName") \
245 template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \ 249 template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \
250 template(java_lang_invoke_MethodHandleImpl, "java/lang/invoke/MethodHandleImpl") \
246 template(java_lang_invoke_AdapterMethodHandle, "java/lang/invoke/AdapterMethodHandle") \ 251 template(java_lang_invoke_AdapterMethodHandle, "java/lang/invoke/AdapterMethodHandle") \
247 template(java_lang_invoke_BoundMethodHandle, "java/lang/invoke/BoundMethodHandle") \ 252 template(java_lang_invoke_BoundMethodHandle, "java/lang/invoke/BoundMethodHandle") \
248 template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \ 253 template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \
254 template(java_lang_invoke_CountingMethodHandle, "java/lang/invoke/CountingMethodHandle") \
249 /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \ 255 /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \
250 template(findMethodHandleType_name, "findMethodHandleType") \ 256 template(findMethodHandleType_name, "findMethodHandleType") \
251 template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;") \ 257 template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;") \
252 template(notifyGenericMethodType_name, "notifyGenericMethodType") \ 258 template(notifyGenericMethodType_name, "notifyGenericMethodType") \
253 template(notifyGenericMethodType_signature, "(Ljava/lang/invoke/MethodType;)V") \ 259 template(notifyGenericMethodType_signature, "(Ljava/lang/invoke/MethodType;)V") \
254 template(linkMethodHandleConstant_name, "linkMethodHandleConstant") \ 260 template(linkMethodHandleConstant_name, "linkMethodHandleConstant") \
255 template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;") \ 261 template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;") \
256 template(makeDynamicCallSite_name, "makeDynamicCallSite") \ 262 template(makeDynamicCallSite_name, "makeDynamicCallSite") \
257 template(makeDynamicCallSite_signature, "(Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;Ljava/lang/invoke/MemberName;I)Ljava/lang/invoke/CallSite;") \ 263 template(makeDynamicCallSite_signature, "(Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;Ljava/lang/invoke/MemberName;I)Ljava/lang/invoke/CallSite;") \
258 NOT_LP64( do_alias(machine_word_signature, int_signature) ) \ 264 template(setTargetNormal_name, "setTargetNormal") \
259 LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \ 265 template(setTargetVolatile_name, "setTargetVolatile") \
266 template(setTarget_signature, "(Ljava/lang/invoke/MethodHandle;)V") \
267 NOT_LP64( do_alias(intptr_signature, int_signature) ) \
268 LP64_ONLY( do_alias(intptr_signature, long_signature) ) \
269 template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \
260 \ 270 \
261 /* support for graal */ \ 271 /* support for graal */ \
262 template(com_sun_hotspot_graal_VMExits, "com/oracle/max/graal/hotspot/VMExits") \ 272 template(com_sun_hotspot_graal_VMExits, "com/oracle/max/graal/hotspot/VMExits") \
263 template(com_sun_hotspot_graal_HotSpotMethodResolved, "com/oracle/max/graal/hotspot/HotSpotMethodResolvedImpl") \ 273 template(com_sun_hotspot_graal_HotSpotMethodResolved, "com/oracle/max/graal/hotspot/HotSpotMethodResolvedImpl") \
264 template(com_sun_hotspot_graal_HotSpotTargetMethod, "com/oracle/max/graal/hotspot/HotSpotTargetMethod") \ 274 template(com_sun_hotspot_graal_HotSpotTargetMethod, "com/oracle/max/graal/hotspot/HotSpotTargetMethod") \
341 template(getInstance_signature, "()Lcom/oracle/max/graal/hotspot/Compiler;") \ 351 template(getInstance_signature, "()Lcom/oracle/max/graal/hotspot/Compiler;") \
342 template(forObject_name, "forObject") \ 352 template(forObject_name, "forObject") \
343 template(callbackInternal_name, "callbackInternal") \ 353 template(callbackInternal_name, "callbackInternal") \
344 template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ 354 template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \
345 \ 355 \
356 \
346 /* common method and field names */ \ 357 /* common method and field names */ \
347 template(object_initializer_name, "<init>") \ 358 template(object_initializer_name, "<init>") \
348 template(class_initializer_name, "<clinit>") \ 359 template(class_initializer_name, "<clinit>") \
349 template(println_name, "println") \ 360 template(println_name, "println") \
350 template(printStackTrace_name, "printStackTrace") \ 361 template(printStackTrace_name, "printStackTrace") \
425 template(values_name, "values") \ 436 template(values_name, "values") \
426 template(receiver_name, "receiver") \ 437 template(receiver_name, "receiver") \
427 template(vmmethod_name, "vmmethod") \ 438 template(vmmethod_name, "vmmethod") \
428 template(vmtarget_name, "vmtarget") \ 439 template(vmtarget_name, "vmtarget") \
429 template(vmentry_name, "vmentry") \ 440 template(vmentry_name, "vmentry") \
441 template(vmcount_name, "vmcount") \
430 template(vmslots_name, "vmslots") \ 442 template(vmslots_name, "vmslots") \
431 template(vmlayout_name, "vmlayout") \ 443 template(vmlayout_name, "vmlayout") \
432 template(vmindex_name, "vmindex") \ 444 template(vmindex_name, "vmindex") \
433 template(vmargslot_name, "vmargslot") \ 445 template(vmargslot_name, "vmargslot") \
434 template(flags_name, "flags") \ 446 template(flags_name, "flags") \
438 template(ptypes_name, "ptypes") \ 450 template(ptypes_name, "ptypes") \
439 template(form_name, "form") \ 451 template(form_name, "form") \
440 template(erasedType_name, "erasedType") \ 452 template(erasedType_name, "erasedType") \
441 template(genericInvoker_name, "genericInvoker") \ 453 template(genericInvoker_name, "genericInvoker") \
442 template(append_name, "append") \ 454 template(append_name, "append") \
455 template(klass_name, "klass") \
456 template(resolved_constructor_name, "resolved_constructor") \
457 template(array_klass_name, "array_klass") \
458 template(oop_size_name, "oop_size") \
459 template(static_oop_field_count_name, "static_oop_field_count") \
443 \ 460 \
444 /* non-intrinsic name/signature pairs: */ \ 461 /* non-intrinsic name/signature pairs: */ \
445 template(register_method_name, "register") \ 462 template(register_method_name, "register") \
446 do_alias(register_method_signature, object_void_signature) \ 463 do_alias(register_method_signature, object_void_signature) \
447 \ 464 \
989 do_intrinsic(_invokeExact, java_lang_invoke_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \ 1006 do_intrinsic(_invokeExact, java_lang_invoke_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \
990 do_intrinsic(_invokeGeneric, java_lang_invoke_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \ 1007 do_intrinsic(_invokeGeneric, java_lang_invoke_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \
991 do_intrinsic(_invokeVarargs, java_lang_invoke_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \ 1008 do_intrinsic(_invokeVarargs, java_lang_invoke_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \
992 do_intrinsic(_invokeDynamic, java_lang_invoke_InvokeDynamic, star_name, object_array_object_signature, F_SN) \ 1009 do_intrinsic(_invokeDynamic, java_lang_invoke_InvokeDynamic, star_name, object_array_object_signature, F_SN) \
993 \ 1010 \
1011 do_intrinsic(_selectAlternative, java_lang_invoke_MethodHandleImpl, selectAlternative_name, selectAlternative_signature, F_S) \
1012 \
994 /* unboxing methods: */ \ 1013 /* unboxing methods: */ \
995 do_intrinsic(_booleanValue, java_lang_Boolean, booleanValue_name, void_boolean_signature, F_R) \ 1014 do_intrinsic(_booleanValue, java_lang_Boolean, booleanValue_name, void_boolean_signature, F_R) \
996 do_name( booleanValue_name, "booleanValue") \ 1015 do_name( booleanValue_name, "booleanValue") \
997 do_intrinsic(_byteValue, java_lang_Byte, byteValue_name, void_byte_signature, F_R) \ 1016 do_intrinsic(_byteValue, java_lang_Byte, byteValue_name, void_byte_signature, F_R) \
998 do_name( byteValue_name, "byteValue") \ 1017 do_name( byteValue_name, "byteValue") \
1034 1053
1035 1054
1036 // Class vmSymbols 1055 // Class vmSymbols
1037 1056
1038 class vmSymbols: AllStatic { 1057 class vmSymbols: AllStatic {
1039 friend class vmIntrinsics; 1058 friend class vmIntrinsics;
1059 friend class VMStructs;
1040 public: 1060 public:
1041 // enum for figuring positions and size of array holding Symbol*s 1061 // enum for figuring positions and size of array holding Symbol*s
1042 enum SID { 1062 enum SID {
1043 NO_SID = 0, 1063 NO_SID = 0,
1044 1064