src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java

@@ -22,10 +22,11 @@
  *
  */
 
 package sun.jvm.hotspot.gc.z;
 
+import sun.jvm.hotspot.debugger.Address;
 import sun.jvm.hotspot.runtime.VM;
 import sun.jvm.hotspot.types.Field;
 import sun.jvm.hotspot.types.Type;
 import sun.jvm.hotspot.types.TypeDataBase;
 

@@ -52,13 +53,14 @@
     public static long ZAddressOffsetShift;
 
     // Pointer part of address
     public static long ZAddressOffsetBits;
     public static long ZAddressOffsetMask;
+    public static long ZAddressOffsetMax;
 
     // Address space start/end/size
-    public static long ZAddressSpaceStart;
+    public static Address ZAddressSpaceStart;
 
     static {
         VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
     }
 

@@ -82,12 +84,14 @@
 
         ZAddressOffsetShift = db.lookupLongConstant("ZAddressOffsetShift").longValue();
 
         ZAddressOffsetBits = db.lookupLongConstant("ZAddressOffsetBits").longValue();
         ZAddressOffsetMask = db.lookupLongConstant("ZAddressOffsetMask").longValue();
+        ZAddressOffsetMax = db.lookupLongConstant("ZAddressOffsetMax").longValue();
 
-        ZAddressSpaceStart = db.lookupLongConstant("ZAddressSpaceStart").longValue();
+        ZAddressSpaceStart = VM.getVM().getDebugger().parseAddress(
+            "0x" + Long.toUnsignedString(db.lookupLongConstant("ZAddressSpaceStart").longValue(), 16));
     }
 
     private static ZGlobalsForVMStructs instance() {
         return new ZGlobalsForVMStructs(instanceField.getAddress());
     }