Use sun.misc.Unsafe in pointers and not in indexers

Author: matteodg

src/main/java/org/bytedeco/javacpp/BoolPointer.java

@@ -71,7 +71,6 @@ public BoolPointer(long size) {
     public BoolPointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public BoolPointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public BoolPointer position(long position) {
@@ -90,7 +89,7 @@ public BoolPointer() { }
     public boolean get() { return get(0); }
     /** @return the i-th {@code bool} value of a native array
      * @param i*/
-    @Cast("bool") public native boolean get(long i);
+    @Cast("bool") public boolean get(long i) { return Raw.getInstance().getBool(address + i * sizeof()); }
     /** @return {@code put(0, b)} */
     public BoolPointer put(boolean b) { return put(0, b); }
     /**
@@ -100,5 +99,8 @@ public BoolPointer() { }
      * @param b the {@code bool} value to copy
      * @return this
      */
-    public native BoolPointer put(long i, boolean b);
+    public BoolPointer put(long i, boolean b) {
+        Raw.getInstance().putBool(address + i * sizeof(), b);
+        return this;
+    }
 }

src/main/java/org/bytedeco/javacpp/BooleanPointer.java

@@ -98,7 +98,6 @@ public BooleanPointer(long size) {
     public BooleanPointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public BooleanPointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public BooleanPointer position(long position) {
@@ -119,7 +118,7 @@ public BooleanPointer() { }
     /** @return {@code get(0)} */
     public boolean get() { return get(0); }
     /** @return the i-th {@code boolean} value of a native array */
-    public native boolean get(long i);
+    public boolean get(long i) { return Raw.getInstance().getByte(address + i * sizeof()) != 0; }
     /** @return {@code put(0, b)} */
     public BooleanPointer put(boolean b) { return put(0, b); }
     /**
@@ -129,7 +128,10 @@ public BooleanPointer() { }
      * @param b the {@code boolean} value to copy
      * @return this
      */
-    public native BooleanPointer put(long i, boolean b);
+    public BooleanPointer put(long i, boolean b) {
+        Raw.getInstance().putByte(address + i * sizeof(), (byte) (b ? 1 : 0));
+        return this;
+    }
 
     /** @return {@code get(array, 0, array.length)} */
     public BooleanPointer get(boolean[] array) { return get(array, 0, array.length); }

src/main/java/org/bytedeco/javacpp/BytePointer.java

@@ -138,7 +138,6 @@ public BytePointer(long size) {
     public BytePointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public BytePointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public BytePointer position(long position) {
@@ -248,7 +247,7 @@ public BytePointer putString(String s) {
     /** @return {@code get(0)} */
     public byte get() { return get(0); }
     /** @return the i-th {@code byte} value of a native array */
-    public native byte get(long i);
+    public byte get(long i) { return Raw.getInstance().getByte(address + i * sizeof()); }
     /** @return {@code put(0, b)} */
     public BytePointer put(byte b) { return put(0, b); }
     /**
@@ -258,7 +257,10 @@ public BytePointer putString(String s) {
      * @param b the {@code byte} value to copy
      * @return this
      */
-    public native BytePointer put(long i, byte b);
+    public BytePointer put(long i, byte b) {
+        Raw.getInstance().putByte(address + i * sizeof(), b);
+        return this;
+    }
 
     /** @return {@code get(array, 0, array.length)} */
     public BytePointer get(byte[] array) { return get(array, 0, array.length); }

src/main/java/org/bytedeco/javacpp/CLongPointer.java

@@ -82,7 +82,6 @@ public CLongPointer(long size) {
     public CLongPointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public CLongPointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public CLongPointer position(long position) {
@@ -100,7 +99,7 @@ public CLongPointer() { }
     /** @return {@code get(0)} */
     public long get() { return get(0); }
     /** @return the i-th {@code long} value of a native array */
-    @Cast("long") public native long get(long i);
+    @Cast("long") public long get(long i) { return Raw.getInstance().getCLong(address + i * sizeof()); }
     /** @return {@code put(0, l)} */
     public CLongPointer put(long l) { return put(0, l); }
     /**
@@ -110,7 +109,10 @@ public CLongPointer() { }
      * @param l the {@code long} value to copy
      * @return this
      */
-    public native CLongPointer put(long i, long l);
+    public CLongPointer put(long i, long l) {
+        Raw.getInstance().putCLong(address + i * sizeof(), l);
+        return this;
+    }
 
     /** @return {@code get(array, 0, array.length)} */
     public CLongPointer get(long[] array) { return get(array, 0, array.length); }

src/main/java/org/bytedeco/javacpp/CharPointer.java

@@ -104,7 +104,6 @@ public CharPointer(long size) {
     public CharPointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public CharPointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public CharPointer position(long position) {
@@ -166,7 +165,7 @@ public CharPointer putString(String s) {
     /** @return {@code get(0)} */
     public char get() { return get(0); }
     /** @return the i-th {@code char} value of a native array */
-    public native char get(long i);
+    public char get(long i) { return Raw.getInstance().getChar(address + i * sizeof()); }
     /** @return {@code put(0, c)} */
     public CharPointer put(char c) { return put(0, c); }
     /**
@@ -176,7 +175,10 @@ public CharPointer putString(String s) {
      * @param c the {@code char} value to copy
      * @return this
      */
-    public native CharPointer put(long i, char c);
+    public CharPointer put(long i, char c) {
+        Raw.getInstance().putChar(address + i * sizeof(), c);
+        return this;
+    }
 
     /** @return {@code get(array, 0, array.length)} */
     public CharPointer get(char[] array) { return get(array, 0, array.length); }

src/main/java/org/bytedeco/javacpp/DoublePointer.java

@@ -94,7 +94,6 @@ public DoublePointer(long size) {
     public DoublePointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public DoublePointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public DoublePointer position(long position) {
@@ -115,7 +114,7 @@ public DoublePointer() { }
     /** @return {@code get(0)} */
     public double get() { return get(0); }
     /** @return the i-th {@code double} value of a native array */
-    public native double get(long i);
+    public double get(long i) { return Raw.getInstance().getDouble(address + i * sizeof()); }
     /** @return {@code put(0, d)} */
     public DoublePointer put(double d) { return put(0, d); }
     /**
@@ -125,7 +124,10 @@ public DoublePointer() { }
      * @param d the {@code double} value to copy
      * @return this
      */
-    public native DoublePointer put(long i, double d);
+    public DoublePointer put(long i, double d) {
+        Raw.getInstance().putDouble(address + i * sizeof(), d);
+        return this;
+    }
 
     /** @return {@code get(array, 0, array.length)} */
     public DoublePointer get(double[] array) { return get(array, 0, array.length); }

src/main/java/org/bytedeco/javacpp/FloatPointer.java

@@ -94,7 +94,6 @@ public FloatPointer(long size) {
     public FloatPointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public FloatPointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public FloatPointer position(long position) {
@@ -115,7 +114,7 @@ public FloatPointer() { }
     /** @return {@code get(0)} */
     public float get() { return get(0); }
     /** @return the i-th {@code float} value of a native array */
-    public native float get(long i);
+    public float get(long i) { return Raw.getInstance().getFloat(address + i * sizeof()); }
     /** @return {@code put(0, f)} */
     public FloatPointer put(float f) { return put(0, f); }
     /**
@@ -125,7 +124,10 @@ public FloatPointer() { }
      * @param f the {@code float} value to copy
      * @return this
      */
-    public native FloatPointer put(long i, float f);
+    public FloatPointer put(long i, float f) {
+        Raw.getInstance().putFloat(address + i * sizeof(), f);
+        return this;
+    }
 
     /** @return {@code get(array, 0, array.length)} */
     public FloatPointer get(float[] array) { return get(array, 0, array.length); }

src/main/java/org/bytedeco/javacpp/IntPointer.java

@@ -104,7 +104,6 @@ public IntPointer(long size) {
     public IntPointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public IntPointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public IntPointer position(long position) {
@@ -170,7 +169,7 @@ public IntPointer putString(String s) {
     /** @return {@code get(0)} */
     public int get() { return get(0); }
     /** @return the i-th {@code int} value of a native array */
-    public native int get(long i);
+    public int get(long i) { return Raw.getInstance().getInt(address + i * sizeof()); }
     /** @return {@code put(0, j)} */
     public IntPointer put(int j) { return put(0, j); }
     /**
@@ -180,7 +179,10 @@ public IntPointer putString(String s) {
      * @param j the {@code int} value to copy
      * @return this
      */
-    public native IntPointer put(long i, int j);
+    public IntPointer put(long i, int j) {
+        Raw.getInstance().putInt(address + i * sizeof(), j);
+        return this;
+    }
 
     /** @return {@code get(array, 0, array.length)} */
     public IntPointer get(int[] array) { return get(array, 0, array.length); }

src/main/java/org/bytedeco/javacpp/LongPointer.java

@@ -94,7 +94,6 @@ public LongPointer(long size) {
     public LongPointer() { }
     /** @see Pointer#Pointer(Pointer) */
     public LongPointer(Pointer p) { super(p); }
-    private native void allocateArray(long size);
 
     /** @see Pointer#position(long) */
     @Override public LongPointer position(long position) {

src/main/java/org/bytedeco/javacpp/Pointer.java

@@ -110,6 +110,10 @@ public Pointer(final Buffer b) {
     }
     private native void allocate(Buffer b);
 
+    protected void allocateArray(long size) {
+        this.address = Raw.getInstance().allocateMemory(size * sizeof());
+    }
+
     /**
      * Called by native libraries to initialize the object fields.
      *