--- /dev/null	2018-11-30 10:10:44.238550338 +0100
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shenandoah/ShenandoahHeap.java	2018-11-30 10:22:09.672811775 +0100
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.shenandoah;
+
+import sun.jvm.hotspot.gc.shared.CollectedHeap;
+import sun.jvm.hotspot.gc.shared.CollectedHeapName;
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+import sun.jvm.hotspot.memory.MemRegion;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.gc.shared.SpaceClosure;
+import java.io.PrintStream;
+import java.util.Iterator;
+import java.util.Observable;
+import java.util.Observer;
+
+public class ShenandoahHeap extends CollectedHeap {
+    static private CIntegerField numRegions;
+    static private CIntegerField usedRegions;
+    static private CIntegerField committedRegions;
+    static private AddressField  regionsField;
+    static {
+        VM.registerVMInitializedObserver(new Observer() {
+            public void update(Observable o, Object data) {
+                initialize(VM.getVM().getTypeDataBase());
+            }
+        });
+    }
+
+    static private synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ShenandoahHeap");
+        numRegions = type.getCIntegerField("_num_regions");
+        usedRegions = type.getCIntegerField("_used");
+        committedRegions = type.getCIntegerField("_committed");
+
+        regionsField = type.getAddressField("_regions");
+    }
+
+    @Override
+    public CollectedHeapName kind() {
+        return CollectedHeapName.SHENANDOAH;
+    }
+
+    public long numOfRegions() {
+        return numRegions.getValue(addr);
+    }
+
+    public long used() {
+        return usedRegions.getValue(addr);
+    }
+
+    public long committed() {
+        return committedRegions.getValue(addr);
+    }
+
+    public void heapRegionIterate(sun.jvm.hotspot.gc.shared.SpaceClosure scl) {
+        int numRgns = (int)numRegions.getValue(addr);
+        for (int index = 0; index < numRgns; index ++) {
+            ShenandoahHeapRegion r = getRegion(index);
+
+            // Walk live regions
+            if (!r.isTrash() && !r.isUncommitted() && !r.isEmpty()) {
+                scl.doSpace(r);
+            }
+        }
+    }
+
+    @Override
+    public void printOn(PrintStream tty) {
+        MemRegion mr = reservedRegion();
+        tty.print("Shenandoah heap");
+        tty.print(" [" + mr.start() + ", " + mr.end() + "]");
+        tty.println(" region size " + ShenandoahHeapRegion.regionSizeBytes() / 1024 + " K");
+    }
+
+    private ShenandoahHeapRegion getRegion(int index) {
+        Address regsAddr = regionsField.getValue(addr);
+        return (ShenandoahHeapRegion) VMObjectFactory.newObject(ShenandoahHeapRegion.class,
+                regsAddr.getAddressAt(index * VM.getVM().getAddressSize()));
+    }
+
+    public ShenandoahHeap(Address addr) {
+        super(addr);
+    }
+}