8065993: Merge OneContigSpaceCardGeneration with TenuredGeneration

Reviewed-by: mgerdin, kbarrett
This commit is contained in:
Bengt Rutisson 2014-12-01 14:37:25 +01:00
parent ca3e287e96
commit 5c41d82d78
18 changed files with 404 additions and 485 deletions

View file

@ -554,9 +554,9 @@ typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable;
\
nonstatic_field(OffsetTableContigSpace, _offsets, BlockOffsetArray) \
\
nonstatic_field(OneContigSpaceCardGeneration, _min_heap_delta_bytes, size_t) \
nonstatic_field(OneContigSpaceCardGeneration, _the_space, ContiguousSpace*) \
nonstatic_field(OneContigSpaceCardGeneration, _last_gc, WaterMark) \
nonstatic_field(TenuredGeneration, _min_heap_delta_bytes, size_t) \
nonstatic_field(TenuredGeneration, _the_space, ContiguousSpace*) \
nonstatic_field(TenuredGeneration, _last_gc, WaterMark) \
\
\
\
@ -1481,8 +1481,7 @@ typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable;
declare_toplevel_type(Generation) \
declare_type(DefNewGeneration, Generation) \
declare_type(CardGeneration, Generation) \
declare_type(OneContigSpaceCardGeneration, CardGeneration) \
declare_type(TenuredGeneration, OneContigSpaceCardGeneration) \
declare_type(TenuredGeneration, CardGeneration) \
declare_toplevel_type(Space) \
declare_toplevel_type(BitMap) \
declare_type(CompactibleSpace, Space) \
@ -1534,8 +1533,8 @@ typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable;
declare_toplevel_type(HeapWord*) \
declare_toplevel_type(MemRegion*) \
declare_toplevel_type(OffsetTableContigSpace*) \
declare_toplevel_type(OneContigSpaceCardGeneration*) \
declare_toplevel_type(Space*) \
declare_toplevel_type(TenuredGeneration*) \
declare_toplevel_type(ThreadLocalAllocBuffer*) \
\
/************************/ \