comparison src/share/vm/runtime/vmStructs.cpp @ 365:5f44674206d3

Merge
author apetrusenko
date Wed, 24 Sep 2008 15:34:06 -0400
parents cecd8eb4e0ca f8199438385b
children 660978a2a31a
comparison
equal deleted inserted replaced
335:e91159f921a5 365:5f44674206d3
300 nonstatic_field(CardTableModRefBS, _covered, MemRegion*) \ 300 nonstatic_field(CardTableModRefBS, _covered, MemRegion*) \
301 nonstatic_field(CardTableModRefBS, _committed, MemRegion*) \ 301 nonstatic_field(CardTableModRefBS, _committed, MemRegion*) \
302 nonstatic_field(CardTableModRefBS, _guard_region, MemRegion) \ 302 nonstatic_field(CardTableModRefBS, _guard_region, MemRegion) \
303 nonstatic_field(CardTableModRefBS, byte_map_base, jbyte*) \ 303 nonstatic_field(CardTableModRefBS, byte_map_base, jbyte*) \
304 \ 304 \
305 nonstatic_field(CardTableRS, _ct_bs, CardTableModRefBS) \ 305 nonstatic_field(CardTableRS, _ct_bs, CardTableModRefBSForCTRS*) \
306 \ 306 \
307 nonstatic_field(CollectedHeap, _reserved, MemRegion) \ 307 nonstatic_field(CollectedHeap, _reserved, MemRegion) \
308 nonstatic_field(SharedHeap, _perm_gen, PermGen*) \ 308 nonstatic_field(SharedHeap, _perm_gen, PermGen*) \
309 nonstatic_field(CollectedHeap, _barrier_set, BarrierSet*) \ 309 nonstatic_field(CollectedHeap, _barrier_set, BarrierSet*) \
310 nonstatic_field(CollectedHeap, _is_gc_active, bool) \ 310 nonstatic_field(CollectedHeap, _is_gc_active, bool) \
993 declare_toplevel_type(PermGen) \ 993 declare_toplevel_type(PermGen) \
994 declare_type(CompactingPermGen, PermGen) \ 994 declare_type(CompactingPermGen, PermGen) \
995 declare_toplevel_type(BarrierSet) \ 995 declare_toplevel_type(BarrierSet) \
996 declare_type(ModRefBarrierSet, BarrierSet) \ 996 declare_type(ModRefBarrierSet, BarrierSet) \
997 declare_type(CardTableModRefBS, ModRefBarrierSet) \ 997 declare_type(CardTableModRefBS, ModRefBarrierSet) \
998 declare_type(CardTableModRefBSForCTRS, CardTableModRefBS) \
998 declare_toplevel_type(GenRemSet) \ 999 declare_toplevel_type(GenRemSet) \
999 declare_type(CardTableRS, GenRemSet) \ 1000 declare_type(CardTableRS, GenRemSet) \
1000 declare_toplevel_type(BlockOffsetSharedArray) \ 1001 declare_toplevel_type(BlockOffsetSharedArray) \
1001 declare_toplevel_type(BlockOffsetTable) \ 1002 declare_toplevel_type(BlockOffsetTable) \
1002 declare_type(BlockOffsetArray, BlockOffsetTable) \ 1003 declare_type(BlockOffsetArray, BlockOffsetTable) \
1020 \ 1021 \
1021 declare_toplevel_type(BarrierSet*) \ 1022 declare_toplevel_type(BarrierSet*) \
1022 declare_toplevel_type(BlockOffsetSharedArray*) \ 1023 declare_toplevel_type(BlockOffsetSharedArray*) \
1023 declare_toplevel_type(GenRemSet*) \ 1024 declare_toplevel_type(GenRemSet*) \
1024 declare_toplevel_type(CardTableRS*) \ 1025 declare_toplevel_type(CardTableRS*) \
1026 declare_toplevel_type(CardTableModRefBS*) \
1027 declare_toplevel_type(CardTableModRefBS**) \
1028 declare_toplevel_type(CardTableModRefBSForCTRS*) \
1029 declare_toplevel_type(CardTableModRefBSForCTRS**) \
1025 declare_toplevel_type(CollectedHeap*) \ 1030 declare_toplevel_type(CollectedHeap*) \
1026 declare_toplevel_type(ContiguousSpace*) \ 1031 declare_toplevel_type(ContiguousSpace*) \
1027 declare_toplevel_type(DefNewGeneration*) \ 1032 declare_toplevel_type(DefNewGeneration*) \
1028 declare_toplevel_type(EdenSpace*) \ 1033 declare_toplevel_type(EdenSpace*) \
1029 declare_toplevel_type(GenCollectedHeap*) \ 1034 declare_toplevel_type(GenCollectedHeap*) \