< prev index next >
src/share/vm/runtime/vmStructs.cpp
Print this page
rev 12906 : [mq]: gc_interface
@@ -47,10 +47,12 @@
#include "compiler/oopMap.hpp"
#include "gc/parallel/immutableSpace.hpp"
#include "gc/parallel/mutableSpace.hpp"
#include "gc/serial/defNewGeneration.hpp"
#include "gc/serial/tenuredGeneration.hpp"
+#include "gc/shared/cardTable.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "gc/shared/cardTableRS.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/genCollectedHeap.hpp"
#include "gc/shared/generation.hpp"
#include "gc/shared/generationSpec.hpp"
@@ -223,11 +225,11 @@
/* OopDesc and Klass hierarchies (NOTE: MethodData* incomplete) */ \
/******************************************************************/ \
\
volatile_nonstatic_field(oopDesc, _mark, markOop) \
volatile_nonstatic_field(oopDesc, _metadata._klass, Klass*) \
- volatile_nonstatic_field(oopDesc, _metadata._compressed_klass, narrowOop) \
+ volatile_nonstatic_field(oopDesc, _metadata._compressed_klass, narrowKlass) \
static_field(oopDesc, _bs, BarrierSet*) \
nonstatic_field(ArrayKlass, _dimension, int) \
volatile_nonstatic_field(ArrayKlass, _higher_dimension, Klass*) \
volatile_nonstatic_field(ArrayKlass, _lower_dimension, Klass*) \
nonstatic_field(CompiledICHolder, _holder_method, Method*) \
@@ -459,27 +461,26 @@
nonstatic_field(CardGeneration, _bts, BlockOffsetSharedArray*) \
nonstatic_field(CardGeneration, _shrink_factor, size_t) \
nonstatic_field(CardGeneration, _capacity_at_prologue, size_t) \
nonstatic_field(CardGeneration, _used_at_prologue, size_t) \
\
- 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(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, _card_table, CardTable*) \
\
nonstatic_field(CollectedHeap, _reserved, MemRegion) \
nonstatic_field(CollectedHeap, _barrier_set, BarrierSet*) \
- nonstatic_field(CollectedHeap, _defer_initial_card_mark, bool) \
nonstatic_field(CollectedHeap, _is_gc_active, bool) \
nonstatic_field(CollectedHeap, _total_collections, unsigned int) \
\
nonstatic_field(CompactibleSpace, _compaction_top, HeapWord*) \
nonstatic_field(CompactibleSpace, _first_dead, HeapWord*) \
@@ -1539,13 +1540,13 @@
declare_type(OffsetTableContigSpace, ContiguousSpace) \
declare_type(TenuredSpace, OffsetTableContigSpace) \
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) \
declare_type(BlockOffsetArrayContigSpace, BlockOffsetArray) \
declare_type(BlockOffsetArrayNonContigSpace, BlockOffsetArray) \
@@ -1564,15 +1565,15 @@
\
/* Pointers to Garbage Collection types */ \
\
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*) \
declare_toplevel_type(GenCollectedHeap*) \
declare_toplevel_type(Generation*) \
@@ -2291,35 +2292,32 @@
\
declare_constant(AgeTable::table_size) \
\
declare_constant(BarrierSet::ModRef) \
declare_constant(BarrierSet::CardTableModRef) \
- declare_constant(BarrierSet::CardTableForRS) \
- declare_constant(BarrierSet::CardTableExtension) \
- declare_constant(BarrierSet::G1SATBCT) \
- declare_constant(BarrierSet::G1SATBCTLogging) \
+ declare_constant(BarrierSet::G1BarrierSet) \
\
declare_constant(BOTConstants::LogN) \
declare_constant(BOTConstants::LogN_words) \
declare_constant(BOTConstants::N_bytes) \
declare_constant(BOTConstants::N_words) \
declare_constant(BOTConstants::LogBase) \
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::GenCollectedHeap) \
declare_constant(CollectedHeap::ParallelScavengeHeap) \
declare_constant(CollectedHeap::G1CollectedHeap) \
\
< prev index next >