--- /dev/null	2015-06-23 14:29:16.000000000 +0200
+++ new/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java	2015-06-23 14:29:16.000000000 +0200
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2014, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 jdk.internal.jimage;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import sun.misc.JavaNioAccess;
+import sun.misc.SharedSecrets;
+
+final class ImageNativeSubstrate implements ImageSubstrate {
+    private static final JavaNioAccess NIOACCESS =
+            SharedSecrets.getJavaNioAccess();
+
+    private final long id;
+    private final long indexAddress;
+    private final long dataAddress;
+
+    native static long openImage(String imagePath, boolean bigEndian);
+    native static void closeImage(long id);
+    native static long getIndexAddress(long id);
+    native static long getDataAddress(long id);
+    native static boolean readCompressed(long id, long offset,
+            ByteBuffer compressedBuffer, long compressedSize,
+            ByteBuffer uncompressedBuffer, long uncompressedSize);
+    native static boolean read(long id, long offset,
+            ByteBuffer uncompressedBuffer, long uncompressedSize);
+    native static byte[] getStringBytes(long id, int offset);
+    native static long[] getAttributes(long id, int offset);
+    native static long[] findAttributes(long id, byte[] path);
+    native static int[] attributeOffsets(long id);
+
+    static ByteBuffer newDirectByteBuffer(long address, long capacity) {
+        assert capacity < Integer.MAX_VALUE;
+        return NIOACCESS.newDirectByteBuffer(address, (int)capacity, null);
+    }
+
+    private ImageNativeSubstrate(long id) {
+        this.id = id;
+        this.indexAddress = getIndexAddress(id);
+        this.dataAddress = getDataAddress(id);
+    }
+
+    static ImageSubstrate openImage(String imagePath, ByteOrder byteOrder)
+            throws IOException {
+        long id = openImage(imagePath, byteOrder == ByteOrder.BIG_ENDIAN);
+
+        if (id == 0) {
+             throw new IOException("Image not found \"" + imagePath + "\"");
+        }
+
+        return new ImageNativeSubstrate(id);
+    }
+
+    @Override
+    public void close() {
+        closeImage(id);
+    }
+
+    @Override
+    public ByteBuffer getIndexBuffer(long offset, long size) {
+        return newDirectByteBuffer(indexAddress + offset, size);
+    }
+
+    @Override
+    public ByteBuffer getDataBuffer(long offset, long size) {
+        return dataAddress != 0 ?
+                newDirectByteBuffer(dataAddress + offset, size) : null;
+    }
+
+    @Override
+    public boolean supportsDataBuffer() {
+        return dataAddress != 0;
+    }
+
+    @Override
+    public boolean read(long offset,
+                 ByteBuffer compressedBuffer, long compressedSize,
+                 ByteBuffer uncompressedBuffer, long uncompressedSize) {
+        return readCompressed(id, offset,
+                    compressedBuffer, compressedSize,
+                    uncompressedBuffer, uncompressedSize);
+    }
+
+    @Override
+    public boolean read(long offset,
+                 ByteBuffer uncompressedBuffer, long uncompressedSize) {
+        return read(id, offset, uncompressedBuffer, uncompressedSize);
+    }
+
+    @Override
+    public byte[] getStringBytes(int offset) {
+        return getStringBytes(id, offset);
+    }
+
+    @Override
+    public long[] getAttributes(int offset) {
+        return getAttributes(id, offset);
+    }
+
+    @Override
+    public ImageLocation findLocation(UTF8String name, ImageStringsReader strings) {
+        long[] attributes = findAttributes(id, name.getBytes());
+
+        return attributes != null ? new ImageLocation(attributes, strings) : null;
+    }
+
+    @Override
+    public int[] attributeOffsets() {
+        return attributeOffsets(id);
+    }
+}