src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp

@@ -23,19 +23,22 @@
   */
  #ifndef SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
  #define SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
  
  #include "gc/shenandoah/shenandoahHeap.hpp"
+ #include "gc/shenandoah/shenandoahGeneration.hpp"
+ #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
  #include "gc/shenandoah/shenandoahHeapRegion.hpp"
  #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
  
  #define VM_STRUCTS_SHENANDOAH(nonstatic_field, volatile_nonstatic_field, static_field)                \
    nonstatic_field(ShenandoahHeap, _num_regions,                    size_t)                            \
    nonstatic_field(ShenandoahHeap, _regions,                        ShenandoahHeapRegion**)            \
    nonstatic_field(ShenandoahHeap, _log_min_obj_alignment_in_bytes, int)                               \
-   volatile_nonstatic_field(ShenandoahHeap, _used,                  size_t)                            \
+   nonstatic_field(ShenandoahHeap, _global_generation,              ShenandoahGeneration*)             \
    volatile_nonstatic_field(ShenandoahHeap, _committed,             size_t)                            \
+   volatile_nonstatic_field(ShenandoahGeneration, _used,            size_t)                            \
    static_field(ShenandoahHeapRegion, RegionSizeBytes,              size_t)                            \
    static_field(ShenandoahHeapRegion, RegionSizeBytesShift,         size_t)                            \
    nonstatic_field(ShenandoahHeapRegion, _state,                    ShenandoahHeapRegion::RegionState) \
    nonstatic_field(ShenandoahHeapRegion, _index,                    size_t const)                      \
    nonstatic_field(ShenandoahHeapRegion, _bottom,                   HeapWord* const)                   \

@@ -56,11 +59,14 @@
  
  #define VM_TYPES_SHENANDOAH(declare_type,                                     \
                              declare_toplevel_type,                            \
                              declare_integer_type)                             \
    declare_type(ShenandoahHeap, CollectedHeap)                                 \
+   declare_type(ShenandoahGenerationalHeap, ShenandoahHeap)                    \
    declare_toplevel_type(ShenandoahHeapRegion)                                 \
    declare_toplevel_type(ShenandoahHeap*)                                      \
    declare_toplevel_type(ShenandoahHeapRegion*)                                \
    declare_toplevel_type(ShenandoahHeapRegion::RegionState)                    \
+   declare_toplevel_type(ShenandoahGeneration)                                 \
+   declare_toplevel_type(ShenandoahGeneration*)                                \
  
  #endif // SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP