7017732: move static fields into Class to prepare for perm gen removal

Reviewed-by: kvn, coleenp, twisti, stefank
This commit is contained in:
Tom Rodriguez 2011-03-18 16:00:34 -07:00
parent f5ef48f3b9
commit 6e8a263a06
66 changed files with 1031 additions and 461 deletions

View file

@ -269,7 +269,7 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(instanceKlass, _inner_classes, typeArrayOop) \
nonstatic_field(instanceKlass, _nonstatic_field_size, int) \
nonstatic_field(instanceKlass, _static_field_size, int) \
nonstatic_field(instanceKlass, _static_oop_field_size, int) \
nonstatic_field(instanceKlass, _static_oop_field_count, int) \
nonstatic_field(instanceKlass, _nonstatic_oop_map_size, int) \
nonstatic_field(instanceKlass, _is_marked_dependent, bool) \
nonstatic_field(instanceKlass, _minor_version, u2) \
@ -945,6 +945,15 @@ static inline uint64_t cast_uint64_t(size_t x)
static_field(Arguments, _num_jvm_args, int) \
static_field(Arguments, _java_command, char*) \
\
/*********************************/ \
/* java_lang_Class fields */ \
/*********************************/ \
\
static_field(java_lang_Class, klass_offset, int) \
static_field(java_lang_Class, resolved_constructor_offset, int) \
static_field(java_lang_Class, array_klass_offset, int) \
static_field(java_lang_Class, oop_size_offset, int) \
static_field(java_lang_Class, static_oop_field_count_offset, int) \
\
/************************/ \
/* Miscellaneous fields */ \
@ -1414,6 +1423,7 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(intptr_t*) \
declare_unsigned_integer_type(InvocationCounter) /* FIXME: wrong type (not integer) */ \
declare_toplevel_type(JavaThread*) \
declare_toplevel_type(java_lang_Class) \
declare_toplevel_type(jbyte*) \
declare_toplevel_type(jbyte**) \
declare_toplevel_type(jint*) \
@ -1700,15 +1710,6 @@ static inline uint64_t cast_uint64_t(size_t x)
\
declare_constant(ConstantPoolCacheEntry::tosBits) \
\
/*********************************/ \
/* java_lang_Class field offsets */ \
/*********************************/ \
\
declare_constant(java_lang_Class::hc_klass_offset) \
declare_constant(java_lang_Class::hc_array_klass_offset) \
declare_constant(java_lang_Class::hc_resolved_constructor_offset) \
declare_constant(java_lang_Class::hc_number_of_fake_oop_fields) \
\
/***************************************/ \
/* java_lang_Thread::ThreadStatus enum */ \
/***************************************/ \