archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Andrey Petrusenko 2008-09-24 15:34:06 -04:00
commit fe4cab6eeb
214 changed files with 36268 additions and 1305 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/share/vm/runtime/vmStructs.cpp
View file

@ -302,7 +302,7 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(CardTableModRefBS, _guard_region, MemRegion) \
nonstatic_field(CardTableModRefBS, byte_map_base, jbyte*) \
\
nonstatic_field(CardTableRS, _ct_bs, CardTableModRefBS) \
nonstatic_field(CardTableRS, _ct_bs, CardTableModRefBSForCTRS*) \
\
nonstatic_field(CollectedHeap, _reserved, MemRegion) \
nonstatic_field(SharedHeap, _perm_gen, PermGen*) \
@ -995,6 +995,7 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(BarrierSet) \
declare_type(ModRefBarrierSet, BarrierSet) \
declare_type(CardTableModRefBS, ModRefBarrierSet) \
declare_type(CardTableModRefBSForCTRS, CardTableModRefBS) \
declare_toplevel_type(GenRemSet) \
declare_type(CardTableRS, GenRemSet) \
declare_toplevel_type(BlockOffsetSharedArray) \
@ -1022,6 +1023,10 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(BlockOffsetSharedArray*) \
declare_toplevel_type(GenRemSet*) \
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*) \