--- a/src/hotspot/share/gc/z/zGlobals.hpp Wed Nov 20 10:37:46 2019 +0100
+++ b/src/hotspot/share/gc/z/zGlobals.hpp Wed Nov 20 10:37:46 2019 +0100
@@ -50,17 +50,6 @@
// Virtual memory to physical memory ratio
const size_t ZVirtualToPhysicalRatio = 16; // 16:1
-//
-// Page Tiers (assuming ZGranuleSize=2M)
-// -------------------------------------
-//
-// Page Size Object Size Object Alignment
-// --------------------------------------------------
-// Small 2M <= 265K MinObjAlignmentInBytes
-// Medium 32M <= 4M 4K
-// Large N x 2M > 4M 2M
-//
-
// Page types
const uint8_t ZPageTypeSmall = 0;
const uint8_t ZPageTypeMedium = 1;
@@ -68,24 +57,24 @@
// Page size shifts
const size_t ZPageSizeSmallShift = ZGranuleSizeShift;
-const size_t ZPageSizeMediumShift = ZPageSizeSmallShift + 4;
+extern size_t ZPageSizeMediumShift;
// Page sizes
const size_t ZPageSizeSmall = (size_t)1 << ZPageSizeSmallShift;
-const size_t ZPageSizeMedium = (size_t)1 << ZPageSizeMediumShift;
+extern size_t ZPageSizeMedium;
// Object size limits
-const size_t ZObjectSizeLimitSmall = (ZPageSizeSmall / 8); // Allow 12.5% waste
-const size_t ZObjectSizeLimitMedium = (ZPageSizeMedium / 8); // Allow 12.5% waste
+const size_t ZObjectSizeLimitSmall = ZPageSizeSmall / 8; // 12.5% max waste
+extern size_t ZObjectSizeLimitMedium;
// Object alignment shifts
extern const int& ZObjectAlignmentSmallShift;
-const int ZObjectAlignmentMediumShift = ZPageSizeMediumShift - 13; // 8192 objects per page
-const int ZObjectAlignmentLargeShift = ZPageSizeSmallShift;
+extern int ZObjectAlignmentMediumShift;
+const int ZObjectAlignmentLargeShift = ZGranuleSizeShift;
// Object alignments
extern const int& ZObjectAlignmentSmall;
-const int ZObjectAlignmentMedium = 1 << ZObjectAlignmentMediumShift;
+extern int ZObjectAlignmentMedium;
const int ZObjectAlignmentLarge = 1 << ZObjectAlignmentLargeShift;
//