--- /dev/null	2018-04-03 12:55:20.301839954 +0200
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddress.java	2018-06-06 00:42:33.577413052 +0200
@@ -0,0 +1,74 @@
+/*
+ * 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;
+
+class ZAddress {
+    static long as_long(Address value) {
+        if (value == null) {
+            return 0;
+        }
+        return value.asLongValue();
+    };
+
+    static boolean is_null(Address value) {
+        return value == null;
+    }
+
+    static boolean is_weak_bad(Address value) {
+        return (as_long(value) & ZGlobals.ZAddressWeakBadMask()) != 0;
+    }
+
+    static boolean is_weak_good(Address value) {
+        return !is_weak_bad(value) && !is_null(value);
+    }
+
+    static boolean is_weak_good_or_null(Address value) {
+        return !is_weak_bad(value);
+    }
+
+    static long offset(Address address) {
+        return as_long(address) & ZGlobals.ZAddressOffsetMask;
+    }
+
+    static Address address(long value) {
+        VM vm = VM.getVM();
+        if (vm.getOS().equals("solaris") && vm.getCPU().equals("sparc")) {
+            value |= ZGlobals.ZAddressSpaceStart;
+        }
+
+        return ZOop.to_address(value);
+    }
+
+    static Address good(Address value) {
+        return address(offset(value) | ZGlobals.ZAddressGoodMask());
+    }
+
+    static Address good_or_null(Address value) {
+        return is_null(value) ? value : good(value);
+    }
+}