--- /dev/null	2018-04-03 12:55:20.301839954 +0200
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobalsForVMStructs.java	2018-06-01 22:31:19.332552319 +0200
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+class ZGlobalsForVMStructs extends VMObject {
+    private static AddressField ZGlobalPhaseField;
+    private static AddressField ZAddressGoodMaskField;
+    private static AddressField ZAddressBadMaskField;
+    private static AddressField ZAddressWeakBadMaskField;
+    private static AddressField ZObjectAlignmentSmallShiftField;
+    private static AddressField ZObjectAlignmentSmallField;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZGlobalsForVMStructs");
+
+        ZGlobalPhaseField = type.getAddressField("_ZGlobalPhase");
+        ZAddressGoodMaskField = type.getAddressField("_ZAddressGoodMask");
+        ZAddressBadMaskField = type.getAddressField("_ZAddressBadMask");
+        ZAddressWeakBadMaskField = type.getAddressField("_ZAddressWeakBadMask");
+        ZObjectAlignmentSmallShiftField = type.getAddressField("_ZObjectAlignmentSmallShift");
+        ZObjectAlignmentSmallField = type.getAddressField("_ZObjectAlignmentSmall");
+    }
+
+    ZGlobalsForVMStructs(Address addr) {
+        super(addr);
+    }
+
+    int ZGlobalPhase() {
+        return ZGlobalPhaseField.getValue(addr).getJIntAt(0);
+    }
+
+    long ZAddressGoodMask() {
+        return ZAddressGoodMaskField.getValue(addr).getJLongAt(0);
+    }
+
+    long ZAddressBadMask() {
+        return ZAddressBadMaskField.getValue(addr).getJLongAt(0);
+    }
+
+    long ZAddressWeakBadMask() {
+        return ZAddressWeakBadMaskField.getValue(addr).getJLongAt(0);
+    }
+
+    int ZObjectAlignmentSmallShift() {
+        return ZObjectAlignmentSmallShiftField.getValue(addr).getJIntAt(0);
+    }
+
+    int ZObjectAlignmentSmall() {
+        return ZObjectAlignmentSmallField.getValue(addr).getJIntAt(0);
+    }
+}