comparison src/share/vm/runtime/vmStructs.cpp @ 2376:c7f3d0b4570f

7017732: move static fields into Class to prepare for perm gen removal Reviewed-by: kvn, coleenp, twisti, stefank
author never
date Fri, 18 Mar 2011 16:00:34 -0700
parents 850b2295a494
children 924777755fad
comparison
equal deleted inserted replaced
2375:d673ef06fe96 2376:c7f3d0b4570f
267 nonstatic_field(instanceKlass, _source_file_name, Symbol*) \ 267 nonstatic_field(instanceKlass, _source_file_name, Symbol*) \
268 nonstatic_field(instanceKlass, _source_debug_extension, Symbol*) \ 268 nonstatic_field(instanceKlass, _source_debug_extension, Symbol*) \
269 nonstatic_field(instanceKlass, _inner_classes, typeArrayOop) \ 269 nonstatic_field(instanceKlass, _inner_classes, typeArrayOop) \
270 nonstatic_field(instanceKlass, _nonstatic_field_size, int) \ 270 nonstatic_field(instanceKlass, _nonstatic_field_size, int) \
271 nonstatic_field(instanceKlass, _static_field_size, int) \ 271 nonstatic_field(instanceKlass, _static_field_size, int) \
272 nonstatic_field(instanceKlass, _static_oop_field_size, int) \ 272 nonstatic_field(instanceKlass, _static_oop_field_count, int) \
273 nonstatic_field(instanceKlass, _nonstatic_oop_map_size, int) \ 273 nonstatic_field(instanceKlass, _nonstatic_oop_map_size, int) \
274 nonstatic_field(instanceKlass, _is_marked_dependent, bool) \ 274 nonstatic_field(instanceKlass, _is_marked_dependent, bool) \
275 nonstatic_field(instanceKlass, _minor_version, u2) \ 275 nonstatic_field(instanceKlass, _minor_version, u2) \
276 nonstatic_field(instanceKlass, _major_version, u2) \ 276 nonstatic_field(instanceKlass, _major_version, u2) \
277 nonstatic_field(instanceKlass, _init_state, instanceKlass::ClassState) \ 277 nonstatic_field(instanceKlass, _init_state, instanceKlass::ClassState) \
943 static_field(Arguments, _num_jvm_flags, int) \ 943 static_field(Arguments, _num_jvm_flags, int) \
944 static_field(Arguments, _jvm_args_array, char**) \ 944 static_field(Arguments, _jvm_args_array, char**) \
945 static_field(Arguments, _num_jvm_args, int) \ 945 static_field(Arguments, _num_jvm_args, int) \
946 static_field(Arguments, _java_command, char*) \ 946 static_field(Arguments, _java_command, char*) \
947 \ 947 \
948 /*********************************/ \
949 /* java_lang_Class fields */ \
950 /*********************************/ \
951 \
952 static_field(java_lang_Class, klass_offset, int) \
953 static_field(java_lang_Class, resolved_constructor_offset, int) \
954 static_field(java_lang_Class, array_klass_offset, int) \
955 static_field(java_lang_Class, oop_size_offset, int) \
956 static_field(java_lang_Class, static_oop_field_count_offset, int) \
948 \ 957 \
949 /************************/ \ 958 /************************/ \
950 /* Miscellaneous fields */ \ 959 /* Miscellaneous fields */ \
951 /************************/ \ 960 /************************/ \
952 \ 961 \
1412 declare_toplevel_type(ConstantPoolCacheEntry) \ 1421 declare_toplevel_type(ConstantPoolCacheEntry) \
1413 declare_toplevel_type(elapsedTimer) \ 1422 declare_toplevel_type(elapsedTimer) \
1414 declare_toplevel_type(intptr_t*) \ 1423 declare_toplevel_type(intptr_t*) \
1415 declare_unsigned_integer_type(InvocationCounter) /* FIXME: wrong type (not integer) */ \ 1424 declare_unsigned_integer_type(InvocationCounter) /* FIXME: wrong type (not integer) */ \
1416 declare_toplevel_type(JavaThread*) \ 1425 declare_toplevel_type(JavaThread*) \
1426 declare_toplevel_type(java_lang_Class) \
1417 declare_toplevel_type(jbyte*) \ 1427 declare_toplevel_type(jbyte*) \
1418 declare_toplevel_type(jbyte**) \ 1428 declare_toplevel_type(jbyte**) \
1419 declare_toplevel_type(jint*) \ 1429 declare_toplevel_type(jint*) \
1420 declare_toplevel_type(jniIdMapBase*) \ 1430 declare_toplevel_type(jniIdMapBase*) \
1421 declare_unsigned_integer_type(juint) \ 1431 declare_unsigned_integer_type(juint) \
1697 /******************************************/ \ 1707 /******************************************/ \
1698 /* ConstantPoolCacheEntry FlagValues enum */ \ 1708 /* ConstantPoolCacheEntry FlagValues enum */ \
1699 /******************************************/ \ 1709 /******************************************/ \
1700 \ 1710 \
1701 declare_constant(ConstantPoolCacheEntry::tosBits) \ 1711 declare_constant(ConstantPoolCacheEntry::tosBits) \
1702 \
1703 /*********************************/ \
1704 /* java_lang_Class field offsets */ \
1705 /*********************************/ \
1706 \
1707 declare_constant(java_lang_Class::hc_klass_offset) \
1708 declare_constant(java_lang_Class::hc_array_klass_offset) \
1709 declare_constant(java_lang_Class::hc_resolved_constructor_offset) \
1710 declare_constant(java_lang_Class::hc_number_of_fake_oop_fields) \
1711 \ 1712 \
1712 /***************************************/ \ 1713 /***************************************/ \
1713 /* java_lang_Thread::ThreadStatus enum */ \ 1714 /* java_lang_Thread::ThreadStatus enum */ \
1714 /***************************************/ \ 1715 /***************************************/ \
1715 \ 1716 \