1.1 --- a/src/share/vm/runtime/vmStructs.cpp Fri Apr 11 09:56:35 2008 -0400
1.2 +++ b/src/share/vm/runtime/vmStructs.cpp Sun Apr 13 17:43:42 2008 -0400
1.3 @@ -71,7 +71,8 @@
1.4 /******************************************************************/ \
1.5 \
1.6 volatile_nonstatic_field(oopDesc, _mark, markOop) \
1.7 - nonstatic_field(oopDesc, _klass, klassOop) \
1.8 + volatile_nonstatic_field(oopDesc, _metadata._klass, wideKlassOop) \
1.9 + volatile_nonstatic_field(oopDesc, _metadata._compressed_klass, narrowOop) \
1.10 static_field(oopDesc, _bs, BarrierSet*) \
1.11 nonstatic_field(arrayKlass, _dimension, int) \
1.12 nonstatic_field(arrayKlass, _higher_dimension, klassOop) \
1.13 @@ -79,13 +80,14 @@
1.14 nonstatic_field(arrayKlass, _vtable_len, int) \
1.15 nonstatic_field(arrayKlass, _alloc_size, juint) \
1.16 nonstatic_field(arrayKlass, _component_mirror, oop) \
1.17 - nonstatic_field(arrayOopDesc, _length, int) \
1.18 nonstatic_field(compiledICHolderKlass, _alloc_size, juint) \
1.19 nonstatic_field(compiledICHolderOopDesc, _holder_method, methodOop) \
1.20 nonstatic_field(compiledICHolderOopDesc, _holder_klass, klassOop) \
1.21 nonstatic_field(constantPoolOopDesc, _tags, typeArrayOop) \
1.22 nonstatic_field(constantPoolOopDesc, _cache, constantPoolCacheOop) \
1.23 nonstatic_field(constantPoolOopDesc, _pool_holder, klassOop) \
1.24 + nonstatic_field(constantPoolOopDesc, _length, int) \
1.25 + nonstatic_field(constantPoolCacheOopDesc, _length, int) \
1.26 nonstatic_field(constantPoolCacheOopDesc, _constant_pool, constantPoolOop) \
1.27 nonstatic_field(instanceKlass, _array_klasses, klassOop) \
1.28 nonstatic_field(instanceKlass, _methods, objArrayOop) \
1.29 @@ -261,6 +263,7 @@
1.30 static_field(Universe, _bootstrapping, bool) \
1.31 static_field(Universe, _fully_initialized, bool) \
1.32 static_field(Universe, _verify_count, int) \
1.33 + static_field(Universe, _heap_base, address) \
1.34 \
1.35 /**********************************************************************************/ \
1.36 /* Generation and Space hierarchies */ \
1.37 @@ -305,8 +308,6 @@
1.38 nonstatic_field(SharedHeap, _perm_gen, PermGen*) \
1.39 nonstatic_field(CollectedHeap, _barrier_set, BarrierSet*) \
1.40 nonstatic_field(CollectedHeap, _is_gc_active, bool) \
1.41 - nonstatic_field(CollectedHeap, _max_heap_capacity, size_t) \
1.42 - \
1.43 nonstatic_field(CompactibleSpace, _compaction_top, HeapWord*) \
1.44 nonstatic_field(CompactibleSpace, _first_dead, HeapWord*) \
1.45 nonstatic_field(CompactibleSpace, _end_of_live, HeapWord*) \
1.46 @@ -912,12 +913,12 @@
1.47 declare_type(arrayKlass, Klass) \
1.48 declare_type(arrayKlassKlass, klassKlass) \
1.49 declare_type(arrayOopDesc, oopDesc) \
1.50 - declare_type(compiledICHolderKlass, Klass) \
1.51 - declare_type(compiledICHolderOopDesc, oopDesc) \
1.52 - declare_type(constantPoolKlass, arrayKlass) \
1.53 - declare_type(constantPoolOopDesc, arrayOopDesc) \
1.54 - declare_type(constantPoolCacheKlass, arrayKlass) \
1.55 - declare_type(constantPoolCacheOopDesc, arrayOopDesc) \
1.56 + declare_type(compiledICHolderKlass, Klass) \
1.57 + declare_type(compiledICHolderOopDesc, oopDesc) \
1.58 + declare_type(constantPoolKlass, Klass) \
1.59 + declare_type(constantPoolOopDesc, oopDesc) \
1.60 + declare_type(constantPoolCacheKlass, Klass) \
1.61 + declare_type(constantPoolCacheOopDesc, oopDesc) \
1.62 declare_type(instanceKlass, Klass) \
1.63 declare_type(instanceKlassKlass, klassKlass) \
1.64 declare_type(instanceOopDesc, oopDesc) \
1.65 @@ -949,9 +950,11 @@
1.66 declare_oop_type(klassOop) \
1.67 declare_oop_type(markOop) \
1.68 declare_oop_type(methodOop) \
1.69 - declare_oop_type(methodDataOop) \
1.70 + declare_oop_type(methodDataOop) \
1.71 declare_oop_type(objArrayOop) \
1.72 declare_oop_type(oop) \
1.73 + declare_oop_type(narrowOop) \
1.74 + declare_oop_type(wideKlassOop) \
1.75 declare_oop_type(constMethodOop) \
1.76 declare_oop_type(symbolOop) \
1.77 declare_oop_type(typeArrayOop) \
1.78 @@ -1307,6 +1310,7 @@
1.79 /* Object sizes */ \
1.80 /****************/ \
1.81 \
1.82 + declare_constant(oopSize) \
1.83 declare_constant(LogBytesPerWord) \
1.84 declare_constant(BytesPerLong) \
1.85 \
1.86 @@ -1314,7 +1318,9 @@
1.87 /* Object alignment */ \
1.88 /********************/ \
1.89 \
1.90 + declare_constant(MinObjAlignment) \
1.91 declare_constant(MinObjAlignmentInBytes) \
1.92 + declare_constant(LogMinObjAlignmentInBytes) \
1.93 \
1.94 /********************************************/ \
1.95 /* Generation and Space Hierarchy Constants */ \
1.96 @@ -1361,7 +1367,6 @@
1.97 \
1.98 declare_constant(HeapWordSize) \
1.99 declare_constant(LogHeapWordSize) \
1.100 - declare_constant(HeapWordsPerOop) \
1.101 \
1.102 /* constants from PermGen::Name enum */ \
1.103 \
1.104 @@ -1610,7 +1615,7 @@
1.105 declare_constant(OopMapValue::unused_value) \
1.106 declare_constant(OopMapValue::oop_value) \
1.107 declare_constant(OopMapValue::value_value) \
1.108 - declare_constant(OopMapValue::dead_value) \
1.109 + declare_constant(OopMapValue::narrowoop_value) \
1.110 declare_constant(OopMapValue::callee_saved_value) \
1.111 declare_constant(OopMapValue::derived_oop_value) \
1.112 \
