comparison src/share/vm/gc_implementation/g1/vmStructs_g1.hpp @ 12355:cefad50507d8

Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents a19bea467577
children 6b8e10e585df de6a9e811145
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
29 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" 29 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
30 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 30 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
31 31
32 #define VM_STRUCTS_G1(nonstatic_field, static_field) \ 32 #define VM_STRUCTS_G1(nonstatic_field, static_field) \
33 \ 33 \
34 static_field(HeapRegion, GrainBytes, size_t) \ 34 static_field(HeapRegion, GrainBytes, size_t) \
35 static_field(HeapRegion, LogOfHRGrainBytes, int) \
35 \ 36 \
36 nonstatic_field(HeapRegionSeq, _regions, HeapRegion**) \ 37 nonstatic_field(G1HeapRegionTable, _base, address) \
37 nonstatic_field(HeapRegionSeq, _length, uint) \ 38 nonstatic_field(G1HeapRegionTable, _length, size_t) \
39 nonstatic_field(G1HeapRegionTable, _biased_base, address) \
40 nonstatic_field(G1HeapRegionTable, _bias, size_t) \
41 nonstatic_field(G1HeapRegionTable, _shift_by, uint) \
42 \
43 nonstatic_field(HeapRegionSeq, _regions, G1HeapRegionTable) \
44 nonstatic_field(HeapRegionSeq, _committed_length, uint) \
38 \ 45 \
39 nonstatic_field(G1CollectedHeap, _hrs, HeapRegionSeq) \ 46 nonstatic_field(G1CollectedHeap, _hrs, HeapRegionSeq) \
40 nonstatic_field(G1CollectedHeap, _g1_committed, MemRegion) \ 47 nonstatic_field(G1CollectedHeap, _g1_committed, MemRegion) \
41 nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t) \ 48 nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t) \
42 nonstatic_field(G1CollectedHeap, _g1mm, G1MonitoringSupport*) \ 49 nonstatic_field(G1CollectedHeap, _g1mm, G1MonitoringSupport*) \
55 nonstatic_field(HeapRegionSetBase, _total_used_bytes, size_t) \ 62 nonstatic_field(HeapRegionSetBase, _total_used_bytes, size_t) \
56 63
57 64
58 #define VM_TYPES_G1(declare_type, declare_toplevel_type) \ 65 #define VM_TYPES_G1(declare_type, declare_toplevel_type) \
59 \ 66 \
67 declare_toplevel_type(G1HeapRegionTable) \
68 \
60 declare_type(G1CollectedHeap, SharedHeap) \ 69 declare_type(G1CollectedHeap, SharedHeap) \
61 \ 70 \
62 declare_type(HeapRegion, ContiguousSpace) \ 71 declare_type(HeapRegion, ContiguousSpace) \
63 declare_toplevel_type(HeapRegionSeq) \ 72 declare_toplevel_type(HeapRegionSeq) \
64 declare_toplevel_type(HeapRegionSetBase) \ 73 declare_toplevel_type(HeapRegionSetBase) \