src/hotspot/share/gc/z/vmStructs_z.hpp

*** 22,33 ****
   */
  
  #ifndef SHARE_GC_Z_VMSTRUCTS_Z_HPP
  #define SHARE_GC_Z_VMSTRUCTS_Z_HPP
  
- #include "gc/z/zAddressRangeMap.hpp"
  #include "gc/z/zCollectedHeap.hpp"
  #include "gc/z/zHeap.hpp"
  #include "gc/z/zPageAllocator.hpp"
  #include "gc/z/zPhysicalMemory.hpp"
  #include "utilities/macros.hpp"
  
--- 22,33 ----
   */
  
  #ifndef SHARE_GC_Z_VMSTRUCTS_Z_HPP
  #define SHARE_GC_Z_VMSTRUCTS_Z_HPP
  
  #include "gc/z/zCollectedHeap.hpp"
+ #include "gc/z/zGranuleMap.hpp"
  #include "gc/z/zHeap.hpp"
  #include "gc/z/zPageAllocator.hpp"
  #include "gc/z/zPhysicalMemory.hpp"
  #include "utilities/macros.hpp"
  
*** 50,60 ****
  
    const int* _ZObjectAlignmentSmallShift;
    const int* _ZObjectAlignmentSmall;
  };
  
! typedef ZAddressRangeMap<ZPageTableEntry, ZGranuleSizeShift> ZAddressRangeMapForPageTable;
  
  #define VM_STRUCTS_ZGC(nonstatic_field, volatile_nonstatic_field, static_field)                      \
    static_field(ZGlobalsForVMStructs,            _instance_p,          ZGlobalsForVMStructs*)         \
    nonstatic_field(ZGlobalsForVMStructs,         _ZGlobalPhase,        uint32_t*)                     \
    nonstatic_field(ZGlobalsForVMStructs,         _ZGlobalSeqNum,       uint32_t*)                     \
--- 50,60 ----
  
    const int* _ZObjectAlignmentSmallShift;
    const int* _ZObjectAlignmentSmall;
  };
  
! typedef ZGranuleMap<ZPageTableEntry> ZGranuleMapForPageTable;
  
  #define VM_STRUCTS_ZGC(nonstatic_field, volatile_nonstatic_field, static_field)                      \
    static_field(ZGlobalsForVMStructs,            _instance_p,          ZGlobalsForVMStructs*)         \
    nonstatic_field(ZGlobalsForVMStructs,         _ZGlobalPhase,        uint32_t*)                     \
    nonstatic_field(ZGlobalsForVMStructs,         _ZGlobalSeqNum,       uint32_t*)                     \
*** 77,98 ****
    nonstatic_field(ZPage,                        _forwarding,          ZForwardingTable)              \
                                                                                                       \
    nonstatic_field(ZPageAllocator,               _physical,            ZPhysicalMemoryManager)        \
    nonstatic_field(ZPageAllocator,               _used,                size_t)                        \
                                                                                                       \
!   nonstatic_field(ZPageTable,                   _map,                 ZAddressRangeMapForPageTable)  \
                                                                                                       \
!   nonstatic_field(ZAddressRangeMapForPageTable, _map,                 ZPageTableEntry* const)        \
                                                                                                       \
!   nonstatic_field(ZVirtualMemory,                _start,              uintptr_t)                     \
!   nonstatic_field(ZVirtualMemory,                _end,                uintptr_t)                     \
                                                                                                       \
!   nonstatic_field(ZForwardingTable,              _table,              ZForwardingTableEntry*)        \
!   nonstatic_field(ZForwardingTable,              _size,               size_t)                        \
                                                                                                       \
!   nonstatic_field(ZPhysicalMemoryManager,        _max_capacity,       const size_t)                  \
!   nonstatic_field(ZPhysicalMemoryManager,        _capacity,           size_t)
  
  #define VM_INT_CONSTANTS_ZGC(declare_constant, declare_constant_with_value)                          \
    declare_constant(ZPhaseRelocate)                                                                   \
    declare_constant(ZPageTypeSmall)                                                                   \
    declare_constant(ZPageTypeMedium)                                                                  \
--- 77,98 ----
    nonstatic_field(ZPage,                        _forwarding,          ZForwardingTable)              \
                                                                                                       \
    nonstatic_field(ZPageAllocator,               _physical,            ZPhysicalMemoryManager)        \
    nonstatic_field(ZPageAllocator,               _used,                size_t)                        \
                                                                                                       \
!   nonstatic_field(ZPageTable,                   _map,                 ZGranuleMapForPageTable)       \
                                                                                                       \
!   nonstatic_field(ZGranuleMapForPageTable,      _map,                 ZPageTableEntry* const)        \
                                                                                                       \
!   nonstatic_field(ZVirtualMemory,               _start,               uintptr_t)                     \
!   nonstatic_field(ZVirtualMemory,               _end,                 uintptr_t)                     \
                                                                                                       \
!   nonstatic_field(ZForwardingTable,             _table,               ZForwardingTableEntry*)        \
!   nonstatic_field(ZForwardingTable,             _size,                size_t)                        \
                                                                                                       \
!   nonstatic_field(ZPhysicalMemoryManager,       _max_capacity,        const size_t)                  \
!   nonstatic_field(ZPhysicalMemoryManager,       _capacity,            size_t)
  
  #define VM_INT_CONSTANTS_ZGC(declare_constant, declare_constant_with_value)                          \
    declare_constant(ZPhaseRelocate)                                                                   \
    declare_constant(ZPageTypeSmall)                                                                   \
    declare_constant(ZPageTypeMedium)                                                                  \
*** 116,126 ****
    declare_toplevel_type(ZHeap)                                                                       \
    declare_toplevel_type(ZPage)                                                                       \
    declare_toplevel_type(ZPageAllocator)                                                              \
    declare_toplevel_type(ZPageTable)                                                                  \
    declare_toplevel_type(ZPageTableEntry)                                                             \
!   declare_toplevel_type(ZAddressRangeMapForPageTable)                                                \
    declare_toplevel_type(ZVirtualMemory)                                                              \
    declare_toplevel_type(ZForwardingTable)                                                            \
    declare_toplevel_type(ZForwardingTableEntry)                                                       \
    declare_toplevel_type(ZPhysicalMemoryManager)
  
--- 116,126 ----
    declare_toplevel_type(ZHeap)                                                                       \
    declare_toplevel_type(ZPage)                                                                       \
    declare_toplevel_type(ZPageAllocator)                                                              \
    declare_toplevel_type(ZPageTable)                                                                  \
    declare_toplevel_type(ZPageTableEntry)                                                             \
!   declare_toplevel_type(ZGranuleMapForPageTable)                                                     \
    declare_toplevel_type(ZVirtualMemory)                                                              \
    declare_toplevel_type(ZForwardingTable)                                                            \
    declare_toplevel_type(ZForwardingTableEntry)                                                       \
    declare_toplevel_type(ZPhysicalMemoryManager)