--- a/src/hotspot/share/runtime/vmStructs.cpp Mon Feb 26 09:34:20 2018 +0100
+++ b/src/hotspot/share/runtime/vmStructs.cpp Mon Feb 26 09:34:12 2018 +0100
@@ -466,20 +466,19 @@
nonstatic_field(CardGeneration, _capacity_at_prologue, size_t) \
nonstatic_field(CardGeneration, _used_at_prologue, size_t) \
\
+ nonstatic_field(CardTable, _whole_heap, const MemRegion) \
+ nonstatic_field(CardTable, _guard_index, const size_t) \
+ nonstatic_field(CardTable, _last_valid_index, const size_t) \
+ nonstatic_field(CardTable, _page_size, const size_t) \
+ nonstatic_field(CardTable, _byte_map_size, const size_t) \
+ nonstatic_field(CardTable, _byte_map, jbyte*) \
+ nonstatic_field(CardTable, _cur_covered_regions, int) \
+ nonstatic_field(CardTable, _covered, MemRegion*) \
+ nonstatic_field(CardTable, _committed, MemRegion*) \
+ nonstatic_field(CardTable, _guard_region, MemRegion) \
+ nonstatic_field(CardTable, _byte_map_base, jbyte*) \
nonstatic_field(CardTableModRefBS, _defer_initial_card_mark, bool) \
- nonstatic_field(CardTableModRefBS, _whole_heap, const MemRegion) \
- nonstatic_field(CardTableModRefBS, _guard_index, const size_t) \
- nonstatic_field(CardTableModRefBS, _last_valid_index, const size_t) \
- nonstatic_field(CardTableModRefBS, _page_size, const size_t) \
- nonstatic_field(CardTableModRefBS, _byte_map_size, const size_t) \
- nonstatic_field(CardTableModRefBS, _byte_map, jbyte*) \
- nonstatic_field(CardTableModRefBS, _cur_covered_regions, int) \
- nonstatic_field(CardTableModRefBS, _covered, MemRegion*) \
- nonstatic_field(CardTableModRefBS, _committed, MemRegion*) \
- nonstatic_field(CardTableModRefBS, _guard_region, MemRegion) \
- nonstatic_field(CardTableModRefBS, byte_map_base, jbyte*) \
- \
- nonstatic_field(CardTableRS, _ct_bs, CardTableModRefBSForCTRS*) \
+ nonstatic_field(CardTableModRefBS, _card_table, CardTable*) \
\
nonstatic_field(CollectedHeap, _reserved, MemRegion) \
nonstatic_field(CollectedHeap, _barrier_set, BarrierSet*) \
@@ -1477,9 +1476,9 @@
declare_toplevel_type(BarrierSet) \
declare_type(ModRefBarrierSet, BarrierSet) \
declare_type(CardTableModRefBS, ModRefBarrierSet) \
- declare_type(CardTableModRefBSForCTRS, CardTableModRefBS) \
+ declare_toplevel_type(CardTable) \
+ declare_type(CardTableRS, CardTable) \
declare_toplevel_type(BarrierSet::Name) \
- declare_toplevel_type(CardTableRS) \
declare_toplevel_type(BlockOffsetSharedArray) \
declare_toplevel_type(BlockOffsetTable) \
declare_type(BlockOffsetArray, BlockOffsetTable) \
@@ -1502,11 +1501,11 @@
\
declare_toplevel_type(BarrierSet*) \
declare_toplevel_type(BlockOffsetSharedArray*) \
+ declare_toplevel_type(CardTable*) \
+ declare_toplevel_type(CardTable*const) \
declare_toplevel_type(CardTableRS*) \
declare_toplevel_type(CardTableModRefBS*) \
declare_toplevel_type(CardTableModRefBS**) \
- declare_toplevel_type(CardTableModRefBSForCTRS*) \
- declare_toplevel_type(CardTableModRefBSForCTRS**) \
declare_toplevel_type(CollectedHeap*) \
declare_toplevel_type(ContiguousSpace*) \
declare_toplevel_type(DefNewGeneration*) \
@@ -2240,8 +2239,6 @@
\
declare_constant(BarrierSet::ModRef) \
declare_constant(BarrierSet::CardTableModRef) \
- declare_constant(BarrierSet::CardTableForRS) \
- declare_constant(BarrierSet::CardTableExtension) \
declare_constant(BarrierSet::G1SATBCT) \
declare_constant(BarrierSet::G1SATBCTLogging) \
\
@@ -2253,18 +2250,18 @@
declare_constant(BOTConstants::Base) \
declare_constant(BOTConstants::N_powers) \
\
- declare_constant(CardTableModRefBS::clean_card) \
- declare_constant(CardTableModRefBS::last_card) \
- declare_constant(CardTableModRefBS::dirty_card) \
- declare_constant(CardTableModRefBS::Precise) \
- declare_constant(CardTableModRefBS::ObjHeadPreciseArray) \
- declare_constant(CardTableModRefBS::card_shift) \
- declare_constant(CardTableModRefBS::card_size) \
- declare_constant(CardTableModRefBS::card_size_in_words) \
+ declare_constant(CardTable::clean_card) \
+ declare_constant(CardTable::last_card) \
+ declare_constant(CardTable::dirty_card) \
+ declare_constant(CardTable::Precise) \
+ declare_constant(CardTable::ObjHeadPreciseArray) \
+ declare_constant(CardTable::card_shift) \
+ declare_constant(CardTable::card_size) \
+ declare_constant(CardTable::card_size_in_words) \
\
declare_constant(CardTableRS::youngergen_card) \
\
- declare_constant(G1SATBCardTableModRefBS::g1_young_gen) \
+ declare_constant(G1CardTable::g1_young_gen) \
\
declare_constant(CollectedHeap::SerialHeap) \
declare_constant(CollectedHeap::CMSHeap) \