comparison src/share/vm/classfile/vmSymbols.hpp @ 3464:be4ca325525a

Merge.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 27 Jul 2011 17:32:44 -0700
parents 536528f48708 ba550512d3b2
children 65981c23c1d6
comparison
equal deleted inserted replaced
3239:7c4b4daac19b 3464:be4ca325525a
146 template(java_lang_IllegalThreadStateException, "java/lang/IllegalThreadStateException") \ 146 template(java_lang_IllegalThreadStateException, "java/lang/IllegalThreadStateException") \
147 template(java_lang_IndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException") \ 147 template(java_lang_IndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException") \
148 template(java_lang_InstantiationException, "java/lang/InstantiationException") \ 148 template(java_lang_InstantiationException, "java/lang/InstantiationException") \
149 template(java_lang_InstantiationError, "java/lang/InstantiationError") \ 149 template(java_lang_InstantiationError, "java/lang/InstantiationError") \
150 template(java_lang_InterruptedException, "java/lang/InterruptedException") \ 150 template(java_lang_InterruptedException, "java/lang/InterruptedException") \
151 template(java_lang_BootstrapMethodError, "java/lang/BootstrapMethodError") \
151 template(java_lang_LinkageError, "java/lang/LinkageError") \ 152 template(java_lang_LinkageError, "java/lang/LinkageError") \
152 template(java_lang_NegativeArraySizeException, "java/lang/NegativeArraySizeException") \ 153 template(java_lang_NegativeArraySizeException, "java/lang/NegativeArraySizeException") \
153 template(java_lang_NoSuchFieldException, "java/lang/NoSuchFieldException") \ 154 template(java_lang_NoSuchFieldException, "java/lang/NoSuchFieldException") \
154 template(java_lang_NoSuchMethodException, "java/lang/NoSuchMethodException") \ 155 template(java_lang_NoSuchMethodException, "java/lang/NoSuchMethodException") \
155 template(java_lang_NullPointerException, "java/lang/NullPointerException") \ 156 template(java_lang_NullPointerException, "java/lang/NullPointerException") \
418 template(receiver_name, "receiver") \ 419 template(receiver_name, "receiver") \
419 template(vmmethod_name, "vmmethod") \ 420 template(vmmethod_name, "vmmethod") \
420 template(vmtarget_name, "vmtarget") \ 421 template(vmtarget_name, "vmtarget") \
421 template(vmentry_name, "vmentry") \ 422 template(vmentry_name, "vmentry") \
422 template(vmslots_name, "vmslots") \ 423 template(vmslots_name, "vmslots") \
424 template(vmlayout_name, "vmlayout") \
423 template(vmindex_name, "vmindex") \ 425 template(vmindex_name, "vmindex") \
424 template(vmargslot_name, "vmargslot") \ 426 template(vmargslot_name, "vmargslot") \
425 template(flags_name, "flags") \ 427 template(flags_name, "flags") \
426 template(argument_name, "argument") \ 428 template(argument_name, "argument") \
427 template(conversion_name, "conversion") \ 429 template(conversion_name, "conversion") \
470 template(short_signature, "S") \ 472 template(short_signature, "S") \
471 template(bool_signature, "Z") \ 473 template(bool_signature, "Z") \
472 template(void_signature, "V") \ 474 template(void_signature, "V") \
473 template(byte_array_signature, "[B") \ 475 template(byte_array_signature, "[B") \
474 template(char_array_signature, "[C") \ 476 template(char_array_signature, "[C") \
477 template(int_array_signature, "[I") \
475 template(object_void_signature, "(Ljava/lang/Object;)V") \ 478 template(object_void_signature, "(Ljava/lang/Object;)V") \
476 template(object_int_signature, "(Ljava/lang/Object;)I") \ 479 template(object_int_signature, "(Ljava/lang/Object;)I") \
477 template(object_boolean_signature, "(Ljava/lang/Object;)Z") \ 480 template(object_boolean_signature, "(Ljava/lang/Object;)Z") \
478 template(string_void_signature, "(Ljava/lang/String;)V") \ 481 template(string_void_signature, "(Ljava/lang/String;)V") \
479 template(string_int_signature, "(Ljava/lang/String;)I") \ 482 template(string_int_signature, "(Ljava/lang/String;)I") \
548 template(java_lang_management_MemoryUsage, "java/lang/management/MemoryUsage") \ 551 template(java_lang_management_MemoryUsage, "java/lang/management/MemoryUsage") \
549 template(java_lang_management_ThreadInfo, "java/lang/management/ThreadInfo") \ 552 template(java_lang_management_ThreadInfo, "java/lang/management/ThreadInfo") \
550 template(sun_management_ManagementFactory, "sun/management/ManagementFactory") \ 553 template(sun_management_ManagementFactory, "sun/management/ManagementFactory") \
551 template(sun_management_Sensor, "sun/management/Sensor") \ 554 template(sun_management_Sensor, "sun/management/Sensor") \
552 template(sun_management_Agent, "sun/management/Agent") \ 555 template(sun_management_Agent, "sun/management/Agent") \
556 template(sun_management_GarbageCollectorImpl, "sun/management/GarbageCollectorImpl") \
557 template(getGcInfoBuilder_name, "getGcInfoBuilder") \
558 template(getGcInfoBuilder_signature, "()Lsun/management/GcInfoBuilder;") \
559 template(com_sun_management_GcInfo, "com/sun/management/GcInfo") \
560 template(com_sun_management_GcInfo_constructor_signature, "(Lsun/management/GcInfoBuilder;JJJ[Ljava/lang/management/MemoryUsage;[Ljava/lang/management/MemoryUsage;[Ljava/lang/Object;)V") \
561 template(createGCNotification_name, "createGCNotification") \
562 template(createGCNotification_signature, "(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/sun/management/GcInfo;)V") \
553 template(createMemoryPoolMBean_name, "createMemoryPoolMBean") \ 563 template(createMemoryPoolMBean_name, "createMemoryPoolMBean") \
554 template(createMemoryManagerMBean_name, "createMemoryManagerMBean") \ 564 template(createMemoryManagerMBean_name, "createMemoryManagerMBean") \
555 template(createGarbageCollectorMBean_name, "createGarbageCollectorMBean") \ 565 template(createGarbageCollectorMBean_name, "createGarbageCollectorMBean") \
556 template(createMemoryPoolMBean_signature, "(Ljava/lang/String;ZJJ)Ljava/lang/management/MemoryPoolMBean;") \ 566 template(createMemoryPoolMBean_signature, "(Ljava/lang/String;ZJJ)Ljava/lang/management/MemoryPoolMBean;") \
557 template(createMemoryManagerMBean_signature, "(Ljava/lang/String;)Ljava/lang/management/MemoryManagerMBean;") \ 567 template(createMemoryManagerMBean_signature, "(Ljava/lang/String;)Ljava/lang/management/MemoryManagerMBean;") \
565 template(long_long_long_long_void_signature, "(JJJJ)V") \ 575 template(long_long_long_long_void_signature, "(JJJJ)V") \
566 \ 576 \
567 template(java_lang_management_MemoryPoolMXBean, "java/lang/management/MemoryPoolMXBean") \ 577 template(java_lang_management_MemoryPoolMXBean, "java/lang/management/MemoryPoolMXBean") \
568 template(java_lang_management_MemoryManagerMXBean, "java/lang/management/MemoryManagerMXBean") \ 578 template(java_lang_management_MemoryManagerMXBean, "java/lang/management/MemoryManagerMXBean") \
569 template(java_lang_management_GarbageCollectorMXBean,"java/lang/management/GarbageCollectorMXBean") \ 579 template(java_lang_management_GarbageCollectorMXBean,"java/lang/management/GarbageCollectorMXBean") \
580 template(gcInfoBuilder_name, "gcInfoBuilder") \
570 template(createMemoryPool_name, "createMemoryPool") \ 581 template(createMemoryPool_name, "createMemoryPool") \
571 template(createMemoryManager_name, "createMemoryManager") \ 582 template(createMemoryManager_name, "createMemoryManager") \
572 template(createGarbageCollector_name, "createGarbageCollector") \ 583 template(createGarbageCollector_name, "createGarbageCollector") \
573 template(createMemoryPool_signature, "(Ljava/lang/String;ZJJ)Ljava/lang/management/MemoryPoolMXBean;") \ 584 template(createMemoryPool_signature, "(Ljava/lang/String;ZJJ)Ljava/lang/management/MemoryPoolMXBean;") \
574 template(createMemoryManager_signature, "(Ljava/lang/String;)Ljava/lang/management/MemoryManagerMXBean;") \ 585 template(createMemoryManager_signature, "(Ljava/lang/String;)Ljava/lang/management/MemoryManagerMXBean;") \
755 \ 766 \
756 do_class(java_nio_Buffer, "java/nio/Buffer") \ 767 do_class(java_nio_Buffer, "java/nio/Buffer") \
757 do_intrinsic(_checkIndex, java_nio_Buffer, checkIndex_name, int_int_signature, F_R) \ 768 do_intrinsic(_checkIndex, java_nio_Buffer, checkIndex_name, int_int_signature, F_R) \
758 do_name( checkIndex_name, "checkIndex") \ 769 do_name( checkIndex_name, "checkIndex") \
759 \ 770 \
771 /* java/lang/ref/Reference */ \
772 do_intrinsic(_Reference_get, java_lang_ref_Reference, get_name, void_object_signature, F_R) \
773 \
774 \
760 do_class(sun_misc_AtomicLongCSImpl, "sun/misc/AtomicLongCSImpl") \ 775 do_class(sun_misc_AtomicLongCSImpl, "sun/misc/AtomicLongCSImpl") \
761 do_intrinsic(_get_AtomicLong, sun_misc_AtomicLongCSImpl, get_name, void_long_signature, F_R) \ 776 do_intrinsic(_get_AtomicLong, sun_misc_AtomicLongCSImpl, get_name, void_long_signature, F_R) \
762 /* (symbols get_name and void_long_signature defined above) */ \ 777 /* (symbols get_name and void_long_signature defined above) */ \
763 \ 778 \
764 do_intrinsic(_attemptUpdate, sun_misc_AtomicLongCSImpl, attemptUpdate_name, attemptUpdate_signature, F_R) \ 779 do_intrinsic(_attemptUpdate, sun_misc_AtomicLongCSImpl, attemptUpdate_name, attemptUpdate_signature, F_R) \