<T>Buffer: Removed Direct<T>BufferR?[U|S] and merged it with ByteBufferAs<T>Buffer (T = [Char|Float|Double|Int|Short|Long]). The change doesn't allow the classes to maintain its own readonly flag. It will use the readonly flag of the buffer itself. This will allow consistancy between the parent buffer and the class. The classes are also made to use the buffer's getter and setter methods. Change-Id: I6736dc521fc4b92d40521bab1314d8698925a402
diff --git a/ojluni/src/main/java/java/nio/ByteBufferAsCharBuffer.java b/ojluni/src/main/java/java/nio/ByteBufferAsCharBuffer.java index b629422..302281e 100644 --- a/ojluni/src/main/java/java/nio/ByteBufferAsCharBuffer.java +++ b/ojluni/src/main/java/java/nio/ByteBufferAsCharBuffer.java
@@ -25,24 +25,21 @@ package java.nio; +import libcore.io.Memory; + class ByteBufferAsCharBuffer extends CharBuffer { // package-private protected final ByteBuffer bb; protected final int offset; - private final boolean isReadOnly; private final ByteOrder order; - ByteBufferAsCharBuffer(ByteBuffer bb, ByteOrder order) { - this(bb, order, false); - } - - ByteBufferAsCharBuffer(ByteBuffer bb, ByteOrder order, boolean isReadOnly) { // package-private + ByteBufferAsCharBuffer(ByteBuffer bb, ByteOrder order) { // package-private super(-1, 0, bb.remaining() >> 1, bb.remaining() >> 1); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; int cap = this.capacity(); this.limit(cap); int pos = this.position(); @@ -53,16 +50,10 @@ ByteBufferAsCharBuffer(ByteBuffer bb, int mark, int pos, int lim, int cap, int off, ByteOrder order) { - this(bb, mark, pos, lim, cap, off, order, false); - } - - ByteBufferAsCharBuffer(ByteBuffer bb, - int mark, int pos, int lim, int cap, - int off, ByteOrder order, boolean isReadOnly) { super(mark, pos, lim, cap); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; offset = off; } @@ -73,29 +64,27 @@ int rem = (pos <= lim ? lim - pos : 0); int off = (pos << 1) + offset; assert (off >= 0); - return new ByteBufferAsCharBuffer(bb, -1, 0, rem, rem, off, order, isReadOnly); + return new ByteBufferAsCharBuffer(bb, -1, 0, rem, rem, off, order); } public CharBuffer duplicate() { return new ByteBufferAsCharBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), + markValue(), + position(), + limit(), + capacity(), offset, - order, - isReadOnly); + order); } public CharBuffer asReadOnlyBuffer() { - return new ByteBufferAsCharBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), + return new ByteBufferAsCharBuffer(bb.asReadOnlyBuffer(), + markValue(), + position(), + limit(), + capacity(), offset, - order, - true); + order); } protected int ix(int i) { @@ -103,59 +92,36 @@ } public char get() { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getCharL(bb, ix(nextGetIndex())); - } else { - return Bits.getCharB(bb, ix(nextGetIndex())); - } + return get(nextGetIndex()); } public char get(int i) { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getCharL(bb, ix(checkIndex(i))); - } else { - return Bits.getCharB(bb, ix(checkIndex(i))); - } + return bb.getChar(ix(i)); } public CharBuffer put(char x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putCharL(bb, ix(nextPutIndex()), x); - } else { - Bits.putCharB(bb, ix(nextPutIndex()), x); - } + put(nextPutIndex(), x); return this; } public CharBuffer put(int i, char x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putCharL(bb, ix(checkIndex(i)), x); - } else { - Bits.putCharB(bb, ix(checkIndex(i)), x); - } + bb.putChar(ix(i), x); return this; } public CharBuffer compact() { - if (isReadOnly) { + if (bb.isReadOnly) { throw new ReadOnlyBufferException(); } int pos = position(); int lim = limit(); assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - ByteBuffer db = bb.duplicate(); - db.limit(ix(lim)); - db.position(ix(0)); - ByteBuffer sb = db.slice(); - sb.position(pos << 1); - sb.compact(); + if (!(bb instanceof DirectByteBuffer)) { + System.arraycopy(bb.array(), ix(pos), bb.array(), ix(0), rem << 1); + } else { + Memory.memmove(this, ix(0), this, ix(pos), rem << 1); + } position(rem); limit(capacity()); discardMark(); @@ -167,7 +133,7 @@ } public boolean isReadOnly() { - return isReadOnly; + return bb.isReadOnly; } public String toString(int start, int end) { @@ -204,8 +170,7 @@ pos + end, capacity(), offset, - order, - isReadOnly); + order); } public ByteOrder order() {
diff --git a/ojluni/src/main/java/java/nio/ByteBufferAsDoubleBuffer.java b/ojluni/src/main/java/java/nio/ByteBufferAsDoubleBuffer.java index b90ed32..56b87f2 100644 --- a/ojluni/src/main/java/java/nio/ByteBufferAsDoubleBuffer.java +++ b/ojluni/src/main/java/java/nio/ByteBufferAsDoubleBuffer.java
@@ -25,6 +25,7 @@ package java.nio; +import libcore.io.Memory; class ByteBufferAsDoubleBuffer extends DoubleBuffer { // package-private @@ -32,19 +33,14 @@ protected final ByteBuffer bb; protected final int offset; private final ByteOrder order; - private final boolean isReadOnly; - ByteBufferAsDoubleBuffer(ByteBuffer bb, ByteOrder order) { // package-private - this(bb, order, false); - } - - ByteBufferAsDoubleBuffer(ByteBuffer bb, ByteOrder order, boolean isReadOnly) { // package-private + ByteBufferAsDoubleBuffer(ByteBuffer bb, ByteOrder order) { super(-1, 0, bb.remaining() >> 3, bb.remaining() >> 3); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; int cap = this.capacity(); this.limit(cap); int pos = this.position(); @@ -55,16 +51,10 @@ ByteBufferAsDoubleBuffer(ByteBuffer bb, int mark, int pos, int lim, int cap, int off, ByteOrder order) { - this(bb, mark, pos, lim, cap, off, order, false); - } - - ByteBufferAsDoubleBuffer(ByteBuffer bb, - int mark, int pos, int lim, int cap, - int off, ByteOrder order, boolean isReadOnly) { super(mark, pos, lim, cap); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; offset = off; } @@ -75,29 +65,27 @@ int rem = (pos <= lim ? lim - pos : 0); int off = (pos << 3) + offset; assert (off >= 0); - return new ByteBufferAsDoubleBuffer(bb, -1, 0, rem, rem, off, order, isReadOnly); + return new ByteBufferAsDoubleBuffer(bb, -1, 0, rem, rem, off, order); } public DoubleBuffer duplicate() { return new ByteBufferAsDoubleBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), + markValue(), + position(), + limit(), + capacity(), offset, - order, - isReadOnly); + order); } public DoubleBuffer asReadOnlyBuffer() { - return new ByteBufferAsDoubleBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), + return new ByteBufferAsDoubleBuffer(bb.asReadOnlyBuffer(), + markValue(), + position(), + limit(), + capacity(), offset, - order, - true); + order); } protected int ix(int i) { @@ -105,42 +93,20 @@ } public double get() { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getDoubleL(bb, ix(nextGetIndex())); - } else { - return Bits.getDoubleB(bb, ix(nextGetIndex())); - } + return get(nextGetIndex()); } public double get(int i) { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getDoubleL(bb, ix(checkIndex(i))); - } else { - return Bits.getDoubleB(bb, ix(checkIndex(i))); - } + return bb.getDouble(ix(i)); } public DoubleBuffer put(double x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putDoubleL(bb, ix(nextPutIndex()), x); - } else { - Bits.putDoubleB(bb, ix(nextPutIndex()), x); - } + put(nextPutIndex(), x); return this; } public DoubleBuffer put(int i, double x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putDoubleL(bb, ix(checkIndex(i)), x); - } else { - Bits.putDoubleB(bb, ix(checkIndex(i)), x); - } + bb.putDouble(ix(i), x); return this; } @@ -152,13 +118,11 @@ int lim = limit(); assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - - ByteBuffer db = bb.duplicate(); - db.limit(ix(lim)); - db.position(ix(0)); - ByteBuffer sb = db.slice(); - sb.position(pos << 3); - sb.compact(); + if (!(bb instanceof DirectByteBuffer)) { + System.arraycopy(bb.array(), ix(pos), bb.array(), ix(0), rem << 3); + } else { + Memory.memmove(this, ix(0), this, ix(pos), rem << 3); + } position(rem); limit(capacity()); discardMark(); @@ -170,7 +134,7 @@ } public boolean isReadOnly() { - return isReadOnly; + return bb.isReadOnly; } public ByteOrder order() {
diff --git a/ojluni/src/main/java/java/nio/ByteBufferAsFloatBuffer.java b/ojluni/src/main/java/java/nio/ByteBufferAsFloatBuffer.java index 04277a1..a1496cd 100644 --- a/ojluni/src/main/java/java/nio/ByteBufferAsFloatBuffer.java +++ b/ojluni/src/main/java/java/nio/ByteBufferAsFloatBuffer.java
@@ -25,25 +25,21 @@ package java.nio; +import libcore.io.Memory; + class ByteBufferAsFloatBuffer extends FloatBuffer { // package-private protected final ByteBuffer bb; protected final int offset; - private final boolean isReadOnly; private final ByteOrder order; - ByteBufferAsFloatBuffer(ByteBuffer bb, ByteOrder order) { - this(bb, order, false); - } - - ByteBufferAsFloatBuffer(ByteBuffer bb, ByteOrder order, boolean isReadOnly) { // package-private + ByteBufferAsFloatBuffer(ByteBuffer bb, ByteOrder order) { // package-private super(-1, 0, - bb.remaining() >> 2, bb.remaining() >> 2); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; int cap = this.capacity(); this.limit(cap); int pos = this.position(); @@ -54,16 +50,10 @@ ByteBufferAsFloatBuffer(ByteBuffer bb, int mark, int pos, int lim, int cap, int off, ByteOrder order) { - this(bb, mark, pos, lim, cap, off, order, false); - } - - ByteBufferAsFloatBuffer(ByteBuffer bb, - int mark, int pos, int lim, int cap, - int off, ByteOrder order, boolean isReadOnly) { super(mark, pos, lim, cap); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; offset = off; } @@ -74,29 +64,27 @@ int rem = (pos <= lim ? lim - pos : 0); int off = (pos << 2) + offset; assert (off >= 0); - return new ByteBufferAsFloatBuffer(bb, -1, 0, rem, rem, off, order, isReadOnly); + return new ByteBufferAsFloatBuffer(bb, -1, 0, rem, rem, off, order); } public FloatBuffer duplicate() { return new ByteBufferAsFloatBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), + markValue(), + position(), + limit(), + capacity(), offset, - order, - isReadOnly); + order); } public FloatBuffer asReadOnlyBuffer() { - return new ByteBufferAsFloatBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), + return new ByteBufferAsFloatBuffer(bb.asReadOnlyBuffer(), + markValue(), + position(), + limit(), + capacity(), offset, - order, - true); + order); } protected int ix(int i) { @@ -104,42 +92,20 @@ } public float get() { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getFloatL(bb, ix(nextGetIndex())); - } else { - return Bits.getFloatB(bb, ix(nextGetIndex())); - } + return get(nextGetIndex()); } public float get(int i) { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getFloatL(bb, ix(checkIndex(i))); - } else { - return Bits.getFloatB(bb, ix(checkIndex(i))); - } + return bb.getFloat(ix(i)); } public FloatBuffer put(float x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putFloatL(bb, ix(nextPutIndex()), x); - } else { - Bits.putFloatB(bb, ix(nextPutIndex()), x); - } + put(nextPutIndex(), x); return this; } public FloatBuffer put(int i, float x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putFloatL(bb, ix(checkIndex(i)), x); - } else { - Bits.putFloatB(bb, ix(checkIndex(i)), x); - } + bb.putFloat(ix(i), x); return this; } @@ -151,12 +117,11 @@ int lim = limit(); assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - ByteBuffer db = bb.duplicate(); - db.limit(ix(lim)); - db.position(ix(0)); - ByteBuffer sb = db.slice(); - sb.position(pos << 2); - sb.compact(); + if (!(bb instanceof DirectByteBuffer)) { + System.arraycopy(bb.array(), ix(pos), bb.array(), ix(0), rem << 2); + } else { + Memory.memmove(this, ix(0), this, ix(pos), rem << 2); + } position(rem); limit(capacity()); discardMark(); @@ -168,7 +133,7 @@ } public boolean isReadOnly() { - return isReadOnly; + return bb.isReadOnly; } public ByteOrder order() {
diff --git a/ojluni/src/main/java/java/nio/ByteBufferAsIntBuffer.java b/ojluni/src/main/java/java/nio/ByteBufferAsIntBuffer.java index 92a4e82..291c4d5 100644 --- a/ojluni/src/main/java/java/nio/ByteBufferAsIntBuffer.java +++ b/ojluni/src/main/java/java/nio/ByteBufferAsIntBuffer.java
@@ -25,24 +25,21 @@ package java.nio; +import libcore.io.Memory; + class ByteBufferAsIntBuffer extends IntBuffer { // package-private protected final ByteBuffer bb; protected final int offset; private final ByteOrder order; - private final boolean isReadOnly; ByteBufferAsIntBuffer(ByteBuffer bb, ByteOrder order) { // package-private - this(bb, order, false); - } - - ByteBufferAsIntBuffer(ByteBuffer bb, ByteOrder order, boolean isReadOnly) { // package-private super(-1, 0, bb.remaining() >> 2, bb.remaining() >> 2); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; int cap = this.capacity(); this.limit(cap); int pos = this.position(); @@ -53,16 +50,10 @@ ByteBufferAsIntBuffer(ByteBuffer bb, int mark, int pos, int lim, int cap, int off, ByteOrder order) { - this(bb, mark, pos, lim, cap, off, order, false); - } - - ByteBufferAsIntBuffer(ByteBuffer bb, - int mark, int pos, int lim, int cap, - int off, ByteOrder order, boolean isReadOnly) { super(mark, pos, lim, cap); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; offset = off; } @@ -73,27 +64,27 @@ int rem = (pos <= lim ? lim - pos : 0); int off = (pos << 2) + offset; assert (off >= 0); - return new ByteBufferAsIntBuffer(bb, -1, 0, rem, rem, off, order, isReadOnly); + return new ByteBufferAsIntBuffer(bb, -1, 0, rem, rem, off, order); } public IntBuffer duplicate() { return new ByteBufferAsIntBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - offset, order, isReadOnly); + markValue(), + position(), + limit(), + capacity(), + offset, + order); } public IntBuffer asReadOnlyBuffer() { - return new ByteBufferAsIntBuffer(bb, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), + return new ByteBufferAsIntBuffer(bb.asReadOnlyBuffer(), + markValue(), + position(), + limit(), + capacity(), offset, - order, - true); + order); } protected int ix(int i) { @@ -101,59 +92,36 @@ } public int get() { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getIntL(bb, ix(nextGetIndex())); - } else { - return Bits.getIntB(bb, ix(nextGetIndex())); - } + return get(nextGetIndex()); } public int get(int i) { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getIntL(bb, ix(checkIndex(i))); - } else { - return Bits.getIntB(bb, ix(checkIndex(i))); - } + return bb.getInt(ix(i)); } public IntBuffer put(int x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putIntL(bb, ix(nextPutIndex()), x); - } else { - Bits.putIntB(bb, ix(nextPutIndex()), x); - } + put(nextPutIndex(), x); return this; } public IntBuffer put(int i, int x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putIntL(bb, ix(checkIndex(i)), x); - } else { - Bits.putIntB(bb, ix(checkIndex(i)), x); - } + bb.putInt(ix(i), x); return this; } public IntBuffer compact() { - if (isReadOnly) { + if (bb.isReadOnly) { throw new ReadOnlyBufferException(); } int pos = position(); int lim = limit(); assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - ByteBuffer db = bb.duplicate(); - db.limit(ix(lim)); - db.position(ix(0)); - ByteBuffer sb = db.slice(); - sb.position(pos << 2); - sb.compact(); + if (!(bb instanceof DirectByteBuffer)) { + System.arraycopy(bb.array(), ix(pos), bb.array(), ix(0), rem << 2); + } else { + Memory.memmove(this, ix(0), this, ix(pos), rem << 2); + } position(rem); limit(capacity()); discardMark(); @@ -165,7 +133,7 @@ } public boolean isReadOnly() { - return isReadOnly; + return bb.isReadOnly; } public ByteOrder order() {
diff --git a/ojluni/src/main/java/java/nio/ByteBufferAsLongBuffer.java b/ojluni/src/main/java/java/nio/ByteBufferAsLongBuffer.java index 3fe301c..8ce9a81 100644 --- a/ojluni/src/main/java/java/nio/ByteBufferAsLongBuffer.java +++ b/ojluni/src/main/java/java/nio/ByteBufferAsLongBuffer.java
@@ -25,24 +25,21 @@ package java.nio; +import libcore.io.Memory; + class ByteBufferAsLongBuffer extends LongBuffer { // package-private protected final ByteBuffer bb; protected final int offset; - private final boolean isReadOnly; private final ByteOrder order; ByteBufferAsLongBuffer(ByteBuffer bb, ByteOrder order) { - this(bb, order, false); - } - - ByteBufferAsLongBuffer(ByteBuffer bb, ByteOrder order, boolean isReadOnly) { // package-privaet8 super(-1, 0, bb.remaining() >> 3, bb.remaining() >> 3); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; int cap = this.capacity(); this.limit(cap); int pos = this.position(); @@ -53,16 +50,10 @@ ByteBufferAsLongBuffer(ByteBuffer bb, int mark, int pos, int lim, int cap, int off, ByteOrder order) { - this(bb, mark, pos, lim, cap, off, order, false); - } - - ByteBufferAsLongBuffer(ByteBuffer bb, - int mark, int pos, int lim, int cap, - int off, ByteOrder order, boolean isReadOnly) { super(mark, pos, lim, cap); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; offset = off; } @@ -73,7 +64,7 @@ int rem = (pos <= lim ? lim - pos : 0); int off = (pos << 3) + offset; assert (off >= 0); - return new ByteBufferAsLongBuffer(bb, -1, 0, rem, rem, off, order, isReadOnly); + return new ByteBufferAsLongBuffer(bb, -1, 0, rem, rem, off, order); } public LongBuffer duplicate() { @@ -83,19 +74,17 @@ this.limit(), this.capacity(), offset, - order, - isReadOnly); + order); } public LongBuffer asReadOnlyBuffer() { - return new ByteBufferAsLongBuffer(bb, + return new ByteBufferAsLongBuffer(bb.asReadOnlyBuffer(), this.markValue(), this.position(), this.limit(), this.capacity(), offset, - order, - true); + order); } protected int ix(int i) { @@ -103,42 +92,20 @@ } public long get() { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getLongL(bb, ix(nextGetIndex())); - } else { - return Bits.getLongB(bb, ix(nextGetIndex())); - } + return get(nextGetIndex()); } public long get(int i) { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getLongL(bb, ix(checkIndex(i))); - } else { - return Bits.getLongB(bb, ix(checkIndex(i))); - } + return bb.getLong(ix(i)); } public LongBuffer put(long x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putLongL(bb, ix(nextPutIndex()), x); - } else { - Bits.putLongB(bb, ix(nextPutIndex()), x); - } + put(nextPutIndex(), x); return this; } public LongBuffer put(int i, long x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putLongL(bb, ix(checkIndex(i)), x); - } else { - Bits.putLongB(bb, ix(checkIndex(i)), x); - } + bb.putLong(ix(i), x); return this; } @@ -150,12 +117,11 @@ int lim = limit(); assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - ByteBuffer db = bb.duplicate(); - db.limit(ix(lim)); - db.position(ix(0)); - ByteBuffer sb = db.slice(); - sb.position(pos << 3); - sb.compact(); + if (!(bb instanceof DirectByteBuffer)) { + System.arraycopy(bb.array(), ix(pos), bb.array(), ix(0), rem << 3); + } else { + Memory.memmove(this, ix(0), this, ix(pos), rem << 3); + } position(rem); limit(capacity()); discardMark(); @@ -167,7 +133,7 @@ } public boolean isReadOnly() { - return isReadOnly; + return bb.isReadOnly; } public ByteOrder order() {
diff --git a/ojluni/src/main/java/java/nio/ByteBufferAsShortBuffer.java b/ojluni/src/main/java/java/nio/ByteBufferAsShortBuffer.java index 70c037f..7b89e1d 100644 --- a/ojluni/src/main/java/java/nio/ByteBufferAsShortBuffer.java +++ b/ojluni/src/main/java/java/nio/ByteBufferAsShortBuffer.java
@@ -25,24 +25,21 @@ package java.nio; +import libcore.io.Memory; + class ByteBufferAsShortBuffer extends ShortBuffer { // package-private protected final ByteBuffer bb; protected final int offset; - private final boolean isReadOnly; private final ByteOrder order; - ByteBufferAsShortBuffer(ByteBuffer bb, ByteOrder order) { // package-private - this(bb, order, false); - } - - ByteBufferAsShortBuffer(ByteBuffer bb, ByteOrder order, boolean isReadOnly) { // package-private + ByteBufferAsShortBuffer(ByteBuffer bb, ByteOrder order) { // package-private super(-1, 0, bb.remaining() >> 1, bb.remaining() >> 1); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; int cap = this.capacity(); this.limit(cap); int pos = this.position(); @@ -53,16 +50,10 @@ ByteBufferAsShortBuffer(ByteBuffer bb, int mark, int pos, int lim, int cap, int off, ByteOrder order) { - this(bb, mark, pos, lim, cap, off, order, false); - } - - ByteBufferAsShortBuffer(ByteBuffer bb, - int mark, int pos, int lim, int cap, - int off, ByteOrder order, boolean isReadOnly) { super(mark, pos, lim, cap); this.bb = bb; + this.address = bb.address; this.order = order; - this.isReadOnly = isReadOnly; offset = off; } @@ -73,7 +64,7 @@ int rem = (pos <= lim ? lim - pos : 0); int off = (pos << 1) + offset; assert (off >= 0); - return new ByteBufferAsShortBuffer(bb, -1, 0, rem, rem, off, order, isReadOnly); + return new ByteBufferAsShortBuffer(bb, -1, 0, rem, rem, off, order); } public ShortBuffer duplicate() { @@ -82,16 +73,16 @@ this.position(), this.limit(), this.capacity(), - offset, order, isReadOnly); + offset, order); } public ShortBuffer asReadOnlyBuffer() { - return new ByteBufferAsShortBuffer(bb, + return new ByteBufferAsShortBuffer(bb.asReadOnlyBuffer(), this.markValue(), this.position(), this.limit(), this.capacity(), - offset, order, true); + offset, order); } protected int ix(int i) { @@ -99,42 +90,20 @@ } public short get() { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getShortL(bb, ix(nextGetIndex())); - } else { - return Bits.getShortB(bb, ix(nextGetIndex())); - } + return get(nextGetIndex()); } public short get(int i) { - if (order == ByteOrder.LITTLE_ENDIAN) { - return Bits.getShortL(bb, ix(checkIndex(i))); - } else { - return Bits.getShortB(bb, ix(checkIndex(i))); - } + return bb.getShort(ix(i)); } public ShortBuffer put(short x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putShortL(bb, ix(nextPutIndex()), x); - } else { - Bits.putShortB(bb, ix(nextPutIndex()), x); - } + put(nextPutIndex(), x); return this; } public ShortBuffer put(int i, short x) { - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } - if (order == ByteOrder.LITTLE_ENDIAN) { - Bits.putShortL(bb, ix(checkIndex(i)), x); - } else { - Bits.putShortB(bb, ix(checkIndex(i)), x); - } + bb.putShort(ix(i), x); return this; } @@ -146,12 +115,11 @@ int lim = limit(); assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - ByteBuffer db = bb.duplicate(); - db.limit(ix(lim)); - db.position(ix(0)); - ByteBuffer sb = db.slice(); - sb.position(pos << 1); - sb.compact(); + if (!(bb instanceof DirectByteBuffer)) { + System.arraycopy(bb.array(), ix(pos), bb.array(), ix(0), rem << 1); + } else { + Memory.memmove(this, ix(0), this, ix(pos), rem << 1); + } position(rem); limit(capacity()); discardMark(); @@ -163,7 +131,7 @@ } public boolean isReadOnly() { - return isReadOnly; + return bb.isReadOnly; } public ByteOrder order() {
diff --git a/ojluni/src/main/java/java/nio/DirectByteBuffer.java b/ojluni/src/main/java/java/nio/DirectByteBuffer.java index 492e070..1af5e3f 100644 --- a/ojluni/src/main/java/java/nio/DirectByteBuffer.java +++ b/ojluni/src/main/java/java/nio/DirectByteBuffer.java
@@ -383,32 +383,14 @@ int lim = this.limit(); assert (off <= lim); int rem = (off <= lim ? lim - off : 0); - int size = rem >> 1; - if (!unaligned() && ((address + off) % SizeOf.CHAR != 0)) { - return (CharBuffer)(new ByteBufferAsCharBuffer(this, - -1, - 0, - size, - size, - off, - order(), - isReadOnly)); - } else { - return (nativeByteOrder - ? (CharBuffer)(new DirectCharBufferU(this, - -1, - 0, - size, - size, - off)) - : (CharBuffer)(new DirectCharBufferS(this, - -1, - 0, - size, - size, - off))); - } + return (CharBuffer)(new ByteBufferAsCharBuffer(this, + -1, + 0, + size, + size, + off, + order())); } private short getShort(long a) { @@ -461,32 +443,14 @@ int lim = this.limit(); assert (off <= lim); int rem = (off <= lim ? lim - off : 0); - int size = rem >> 1; - if (!unaligned() && ((address + off) % SizeOf.SHORT != 0)) { - return (ShortBuffer)(new ByteBufferAsShortBuffer(this, - -1, - 0, - size, - size, - off, - order(), - isReadOnly)); - } else { - return (nativeByteOrder - ? (ShortBuffer)(new DirectShortBufferU(this, - -1, - 0, - size, - size, - off)) - : (ShortBuffer)(new DirectShortBufferS(this, - -1, - 0, - size, - size, - off))); - } + return (ShortBuffer)(new ByteBufferAsShortBuffer(this, + -1, + 0, + size, + size, + off, + order())); } private int getInt(long a) { @@ -540,30 +504,13 @@ assert (off <= lim); int rem = (off <= lim ? lim - off : 0); int size = rem >> 2; - if (!unaligned() && ((address + off) % SizeOf.INT != 0)) { - return (IntBuffer)(new ByteBufferAsIntBuffer(this, - -1, - 0, - size, - size, - off, - order(), - isReadOnly)); - } else { - return (nativeByteOrder - ? (IntBuffer)(new DirectIntBufferU(this, - -1, - 0, - size, - size, - off)) - : (IntBuffer)(new DirectIntBufferS(this, - -1, - 0, - size, - size, - off))); - } + return (IntBuffer)(new ByteBufferAsIntBuffer(this, + -1, + 0, + size, + size, + off, + order())); } private long getLong(long a) { @@ -617,30 +564,13 @@ assert (off <= lim); int rem = (off <= lim ? lim - off : 0); int size = rem >> 3; - if (!unaligned() && ((address + off) % SizeOf.LONG != 0)) { - return (LongBuffer)(new ByteBufferAsLongBuffer(this, - -1, - 0, - size, - size, - off, - order(), - isReadOnly)); - } else { - return (nativeByteOrder - ? (LongBuffer)(new DirectLongBufferU(this, - -1, - 0, - size, - size, - off)) - : (LongBuffer)(new DirectLongBufferS(this, - -1, - 0, - size, - size, - off))); - } + return (LongBuffer)(new ByteBufferAsLongBuffer(this, + -1, + 0, + size, + size, + off, + order())); } private float getFloat(long a) { @@ -696,30 +626,13 @@ assert (off <= lim); int rem = (off <= lim ? lim - off : 0); int size = rem >> 2; - if (!unaligned() && ((address + off) % SizeOf.FLOAT != 0)) { - return (FloatBuffer)(new ByteBufferAsFloatBuffer(this, - -1, - 0, - size, - size, - off, - order(), - isReadOnly)); - } else { - return (nativeByteOrder - ? (FloatBuffer)(new DirectFloatBufferU(this, - -1, - 0, - size, - size, - off)) - : (FloatBuffer)(new DirectFloatBufferS(this, - -1, - 0, - size, - size, - off))); - } + return (FloatBuffer)(new ByteBufferAsFloatBuffer(this, + -1, + 0, + size, + size, + off, + order())); } private double getDouble(long a) { @@ -776,30 +689,13 @@ int rem = (off <= lim ? lim - off : 0); int size = rem >> 3; - if (!unaligned() && ((address + off) % SizeOf.DOUBLE != 0)) { - return (DoubleBuffer)(new ByteBufferAsDoubleBuffer(this, - -1, - 0, - size, - size, - off, - order(), - isReadOnly)); - } else { - return (nativeByteOrder - ? (DoubleBuffer)(new DirectDoubleBufferU(this, - -1, - 0, - size, - size, - off)) - : (DoubleBuffer)(new DirectDoubleBufferS(this, - -1, - 0, - size, - size, - off))); - } + return (DoubleBuffer)(new ByteBufferAsDoubleBuffer(this, + -1, + 0, + size, + size, + off, + order())); } public final void free() {
diff --git a/ojluni/src/main/java/java/nio/DirectCharBufferRS.java b/ojluni/src/main/java/java/nio/DirectCharBufferRS.java deleted file mode 100644 index c16d9ef..0000000 --- a/ojluni/src/main/java/java/nio/DirectCharBufferRS.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectCharBufferRS - - - - extends DirectCharBufferS - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectCharBufferRS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public CharBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectCharBufferRS(this, -1, 0, rem, rem, off); - } - - public CharBuffer duplicate() { - return new DirectCharBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public CharBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public CharBuffer put(char x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer put(int i, char x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer put(CharBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer put(char[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - public String toString(int start, int end) { - if ((end > limit()) || (start > end)) - throw new IndexOutOfBoundsException(); - try { - int len = end - start; - char[] ca = new char[len]; - CharBuffer cb = CharBuffer.wrap(ca); - CharBuffer db = this.duplicate(); - db.position(start); - db.limit(end); - cb.put(db); - return new String(ca); - } catch (StringIndexOutOfBoundsException x) { - throw new IndexOutOfBoundsException(); - } - } - - - // --- Methods to support CharSequence --- - - public CharBuffer subSequence(int start, int end) { - int pos = position(); - int lim = limit(); - assert (pos <= lim); - pos = (pos <= lim ? pos : lim); - int len = lim - pos; - - if ((start < 0) || (end > len) || (start > end)) - throw new IndexOutOfBoundsException(); - return new DirectCharBufferRS(this, - -1, - pos + start, - pos + end, - capacity(), - offset); - } - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectCharBufferRU.java b/ojluni/src/main/java/java/nio/DirectCharBufferRU.java deleted file mode 100644 index 8ab4c51..0000000 --- a/ojluni/src/main/java/java/nio/DirectCharBufferRU.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectCharBufferRU - - - - extends DirectCharBufferU - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectCharBufferRU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public CharBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectCharBufferRU(this, -1, 0, rem, rem, off); - } - - public CharBuffer duplicate() { - return new DirectCharBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public CharBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public CharBuffer put(char x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer put(int i, char x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer put(CharBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer put(char[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public CharBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - public String toString(int start, int end) { - if ((end > limit()) || (start > end)) - throw new IndexOutOfBoundsException(); - try { - int len = end - start; - char[] ca = new char[len]; - CharBuffer cb = CharBuffer.wrap(ca); - CharBuffer db = this.duplicate(); - db.position(start); - db.limit(end); - cb.put(db); - return new String(ca); - } catch (StringIndexOutOfBoundsException x) { - throw new IndexOutOfBoundsException(); - } - } - - - // --- Methods to support CharSequence --- - - public CharBuffer subSequence(int start, int end) { - int pos = position(); - int lim = limit(); - assert (pos <= lim); - pos = (pos <= lim ? pos : lim); - int len = lim - pos; - - if ((start < 0) || (end > len) || (start > end)) - throw new IndexOutOfBoundsException(); - return new DirectCharBufferRU(this, - -1, - pos + start, - pos + end, - capacity(), - offset); - } - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectCharBufferS.java b/ojluni/src/main/java/java/nio/DirectCharBufferS.java deleted file mode 100644 index fe4ddc4..0000000 --- a/ojluni/src/main/java/java/nio/DirectCharBufferS.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectCharBufferS - - extends CharBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectCharBufferS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public CharBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectCharBufferS(this, -1, 0, rem, rem, off); - } - - public CharBuffer duplicate() { - return new DirectCharBufferS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public CharBuffer asReadOnlyBuffer() { - - return new DirectCharBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 1); - } - - public char get() { - return (Bits.swap(unsafe.getChar$(ix(nextGetIndex())))); - } - - public char get(int i) { - return (Bits.swap(unsafe.getChar$(ix(checkIndex(i))))); - } - - public CharBuffer get(char[] dst, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToCharArray(ix(pos), dst, - offset << 1, - length << 1); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 1, - length << 1); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public CharBuffer put(char x) { - - unsafe.putChar$(ix(nextPutIndex()), Bits.swap((x))); - return this; - - - - } - - public CharBuffer put(int i, char x) { - - unsafe.putChar$(ix(checkIndex(i)), Bits.swap((x))); - return this; - - - - } - - public CharBuffer put(CharBuffer src) { - - if (src instanceof DirectCharBufferS) { - if (src == this) - throw new IllegalArgumentException(); - DirectCharBufferS sb = (DirectCharBufferS)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public CharBuffer put(char[] src, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromCharArray(src, offset << 1, - ix(pos), length << 1); - else - - Bits.copyFromArray(src, 0, offset << 1, - ix(pos), length << 1); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public CharBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 1); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - public String toString(int start, int end) { - if ((end > limit()) || (start > end)) - throw new IndexOutOfBoundsException(); - try { - int len = end - start; - char[] ca = new char[len]; - CharBuffer cb = CharBuffer.wrap(ca); - CharBuffer db = this.duplicate(); - db.position(start); - db.limit(end); - cb.put(db); - return new String(ca); - } catch (StringIndexOutOfBoundsException x) { - throw new IndexOutOfBoundsException(); - } - } - - - // --- Methods to support CharSequence --- - - public CharBuffer subSequence(int start, int end) { - int pos = position(); - int lim = limit(); - assert (pos <= lim); - pos = (pos <= lim ? pos : lim); - int len = lim - pos; - - if ((start < 0) || (end > len) || (start > end)) - throw new IndexOutOfBoundsException(); - return new DirectCharBufferS(this, - -1, - pos + start, - pos + end, - capacity(), - offset); - } - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectCharBufferU.java b/ojluni/src/main/java/java/nio/DirectCharBufferU.java deleted file mode 100644 index 381311f..0000000 --- a/ojluni/src/main/java/java/nio/DirectCharBufferU.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectCharBufferU - - extends CharBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectCharBufferU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public CharBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectCharBufferU(this, -1, 0, rem, rem, off); - } - - public CharBuffer duplicate() { - return new DirectCharBufferU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public CharBuffer asReadOnlyBuffer() { - - return new DirectCharBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 1); - } - - public char get() { - return ((unsafe.getChar$(ix(nextGetIndex())))); - } - - public char get(int i) { - return ((unsafe.getChar$(ix(checkIndex(i))))); - } - - public CharBuffer get(char[] dst, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToCharArray(ix(pos), dst, - offset << 1, - length << 1); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 1, - length << 1); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public CharBuffer put(char x) { - - unsafe.putChar$(ix(nextPutIndex()), ((x))); - return this; - - - - } - - public CharBuffer put(int i, char x) { - - unsafe.putChar$(ix(checkIndex(i)), ((x))); - return this; - - - - } - - public CharBuffer put(CharBuffer src) { - - if (src instanceof DirectCharBufferU) { - if (src == this) - throw new IllegalArgumentException(); - DirectCharBufferU sb = (DirectCharBufferU)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public CharBuffer put(char[] src, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromCharArray(src, offset << 1, - ix(pos), length << 1); - else - - Bits.copyFromArray(src, 0, offset << 1, - ix(pos), length << 1); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public CharBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 1); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - public String toString(int start, int end) { - if ((end > limit()) || (start > end)) - throw new IndexOutOfBoundsException(); - try { - int len = end - start; - char[] ca = new char[len]; - CharBuffer cb = CharBuffer.wrap(ca); - CharBuffer db = this.duplicate(); - db.position(start); - db.limit(end); - cb.put(db); - return new String(ca); - } catch (StringIndexOutOfBoundsException x) { - throw new IndexOutOfBoundsException(); - } - } - - - // --- Methods to support CharSequence --- - - public CharBuffer subSequence(int start, int end) { - int pos = position(); - int lim = limit(); - assert (pos <= lim); - pos = (pos <= lim ? pos : lim); - int len = lim - pos; - - if ((start < 0) || (end > len) || (start > end)) - throw new IndexOutOfBoundsException(); - return new DirectCharBufferU(this, - -1, - pos + start, - pos + end, - capacity(), - offset); - } - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectDoubleBufferRS.java b/ojluni/src/main/java/java/nio/DirectDoubleBufferRS.java deleted file mode 100644 index 8e91b8a..0000000 --- a/ojluni/src/main/java/java/nio/DirectDoubleBufferRS.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectDoubleBufferRS - - - - extends DirectDoubleBufferS - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectDoubleBufferRS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public DoubleBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectDoubleBufferRS(this, -1, 0, rem, rem, off); - } - - public DoubleBuffer duplicate() { - return new DirectDoubleBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public DoubleBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public DoubleBuffer put(double x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer put(int i, double x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer put(DoubleBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer put(double[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectDoubleBufferRU.java b/ojluni/src/main/java/java/nio/DirectDoubleBufferRU.java deleted file mode 100644 index 3225bbe..0000000 --- a/ojluni/src/main/java/java/nio/DirectDoubleBufferRU.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectDoubleBufferRU - - - - extends DirectDoubleBufferU - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectDoubleBufferRU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public DoubleBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectDoubleBufferRU(this, -1, 0, rem, rem, off); - } - - public DoubleBuffer duplicate() { - return new DirectDoubleBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public DoubleBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public DoubleBuffer put(double x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer put(int i, double x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer put(DoubleBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer put(double[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public DoubleBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectDoubleBufferS.java b/ojluni/src/main/java/java/nio/DirectDoubleBufferS.java deleted file mode 100644 index 1fa1b37..0000000 --- a/ojluni/src/main/java/java/nio/DirectDoubleBufferS.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectDoubleBufferS - - extends DoubleBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectDoubleBufferS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public DoubleBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectDoubleBufferS(this, -1, 0, rem, rem, off); - } - - public DoubleBuffer duplicate() { - return new DirectDoubleBufferS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public DoubleBuffer asReadOnlyBuffer() { - - return new DirectDoubleBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 3); - } - - public double get() { - return Double.longBitsToDouble(Bits.swap(unsafe.getLong$(ix(nextGetIndex())))); - } - - public double get(int i) { - return Double.longBitsToDouble(Bits.swap(unsafe.getLong$(ix(checkIndex(i))))); - } - - public DoubleBuffer get(double[] dst, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 3, - length << 3); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public DoubleBuffer put(double x) { - - unsafe.putLong$(ix(nextPutIndex()), Bits.swap(Double.doubleToRawLongBits(x))); - return this; - - - - } - - public DoubleBuffer put(int i, double x) { - - unsafe.putLong$(ix(checkIndex(i)), Bits.swap(Double.doubleToRawLongBits(x))); - return this; - - - - } - - public DoubleBuffer put(DoubleBuffer src) { - - if (src instanceof DirectDoubleBufferS) { - if (src == this) - throw new IllegalArgumentException(); - DirectDoubleBufferS sb = (DirectDoubleBufferS)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public DoubleBuffer put(double[] src, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); - else - - Bits.copyFromArray(src, 0, offset << 3, - ix(pos), length << 3); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public DoubleBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 3); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectDoubleBufferU.java b/ojluni/src/main/java/java/nio/DirectDoubleBufferU.java deleted file mode 100644 index c6f7730..0000000 --- a/ojluni/src/main/java/java/nio/DirectDoubleBufferU.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectDoubleBufferU - - extends DoubleBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectDoubleBufferU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public DoubleBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectDoubleBufferU(this, -1, 0, rem, rem, off); - } - - public DoubleBuffer duplicate() { - return new DirectDoubleBufferU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public DoubleBuffer asReadOnlyBuffer() { - - return new DirectDoubleBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 3); - } - - public double get() { - return ((unsafe.getDouble$(ix(nextGetIndex())))); - } - - public double get(int i) { - return ((unsafe.getDouble$(ix(checkIndex(i))))); - } - - public DoubleBuffer get(double[] dst, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 3, - length << 3); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public DoubleBuffer put(double x) { - - unsafe.putDouble$(ix(nextPutIndex()), ((x))); - return this; - - - - } - - public DoubleBuffer put(int i, double x) { - - unsafe.putDouble$(ix(checkIndex(i)), ((x))); - return this; - - - - } - - public DoubleBuffer put(DoubleBuffer src) { - - if (src instanceof DirectDoubleBufferU) { - if (src == this) - throw new IllegalArgumentException(); - DirectDoubleBufferU sb = (DirectDoubleBufferU)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public DoubleBuffer put(double[] src, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); - else - - Bits.copyFromArray(src, 0, offset << 3, - ix(pos), length << 3); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public DoubleBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 3); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectFloatBufferRS.java b/ojluni/src/main/java/java/nio/DirectFloatBufferRS.java deleted file mode 100644 index cfe77c5..0000000 --- a/ojluni/src/main/java/java/nio/DirectFloatBufferRS.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectFloatBufferRS - - - - extends DirectFloatBufferS - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectFloatBufferRS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public FloatBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectFloatBufferRS(this, -1, 0, rem, rem, off); - } - - public FloatBuffer duplicate() { - return new DirectFloatBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public FloatBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public FloatBuffer put(float x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer put(int i, float x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer put(FloatBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer put(float[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectFloatBufferRU.java b/ojluni/src/main/java/java/nio/DirectFloatBufferRU.java deleted file mode 100644 index d62cd6d..0000000 --- a/ojluni/src/main/java/java/nio/DirectFloatBufferRU.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectFloatBufferRU - - - - extends DirectFloatBufferU - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectFloatBufferRU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public FloatBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectFloatBufferRU(this, -1, 0, rem, rem, off); - } - - public FloatBuffer duplicate() { - return new DirectFloatBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public FloatBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public FloatBuffer put(float x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer put(int i, float x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer put(FloatBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer put(float[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public FloatBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectFloatBufferS.java b/ojluni/src/main/java/java/nio/DirectFloatBufferS.java deleted file mode 100644 index f67a974..0000000 --- a/ojluni/src/main/java/java/nio/DirectFloatBufferS.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectFloatBufferS - - extends FloatBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectFloatBufferS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public FloatBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectFloatBufferS(this, -1, 0, rem, rem, off); - } - - public FloatBuffer duplicate() { - return new DirectFloatBufferS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public FloatBuffer asReadOnlyBuffer() { - - return new DirectFloatBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 2); - } - - public float get() { - return Float.intBitsToFloat(Bits.swap(unsafe.getInt$(ix(nextGetIndex())))); - } - - public float get(int i) { - return Float.intBitsToFloat(Bits.swap(unsafe.getInt$(ix(checkIndex(i))))); - } - - public FloatBuffer get(float[] dst, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 2, - length << 2); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public FloatBuffer put(float x) { - - unsafe.putInt$(ix(nextPutIndex()), Bits.swap(Float.floatToRawIntBits(x))); - return this; - - - - } - - public FloatBuffer put(int i, float x) { - - unsafe.putInt$(ix(checkIndex(i)), Bits.swap(Float.floatToRawIntBits(x))); - return this; - - - - } - - public FloatBuffer put(FloatBuffer src) { - - if (src instanceof DirectFloatBufferS) { - if (src == this) - throw new IllegalArgumentException(); - DirectFloatBufferS sb = (DirectFloatBufferS)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public FloatBuffer put(float[] src, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); - else - - Bits.copyFromArray(src, 0, offset << 2, - ix(pos), length << 2); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public FloatBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 2); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectFloatBufferU.java b/ojluni/src/main/java/java/nio/DirectFloatBufferU.java deleted file mode 100644 index 574700f..0000000 --- a/ojluni/src/main/java/java/nio/DirectFloatBufferU.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectFloatBufferU - - extends FloatBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectFloatBufferU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public FloatBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectFloatBufferU(this, -1, 0, rem, rem, off); - } - - public FloatBuffer duplicate() { - return new DirectFloatBufferU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public FloatBuffer asReadOnlyBuffer() { - - return new DirectFloatBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 2); - } - - public float get() { - return ((unsafe.getFloat$(ix(nextGetIndex())))); - } - - public float get(int i) { - return ((unsafe.getFloat$(ix(checkIndex(i))))); - } - - public FloatBuffer get(float[] dst, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 2, - length << 2); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public FloatBuffer put(float x) { - - unsafe.putFloat$(ix(nextPutIndex()), ((x))); - return this; - - - - } - - public FloatBuffer put(int i, float x) { - - unsafe.putFloat$(ix(checkIndex(i)), ((x))); - return this; - - - - } - - public FloatBuffer put(FloatBuffer src) { - - if (src instanceof DirectFloatBufferU) { - if (src == this) - throw new IllegalArgumentException(); - DirectFloatBufferU sb = (DirectFloatBufferU)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public FloatBuffer put(float[] src, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); - else - - Bits.copyFromArray(src, 0, offset << 2, - ix(pos), length << 2); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public FloatBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 2); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectIntBufferRS.java b/ojluni/src/main/java/java/nio/DirectIntBufferRS.java deleted file mode 100644 index 19afb90..0000000 --- a/ojluni/src/main/java/java/nio/DirectIntBufferRS.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectIntBufferRS - - - - extends DirectIntBufferS - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectIntBufferRS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public IntBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectIntBufferRS(this, -1, 0, rem, rem, off); - } - - public IntBuffer duplicate() { - return new DirectIntBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public IntBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public IntBuffer put(int x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer put(int i, int x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer put(IntBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer put(int[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectIntBufferRU.java b/ojluni/src/main/java/java/nio/DirectIntBufferRU.java deleted file mode 100644 index 4a28ca4..0000000 --- a/ojluni/src/main/java/java/nio/DirectIntBufferRU.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectIntBufferRU - - - - extends DirectIntBufferU - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectIntBufferRU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public IntBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectIntBufferRU(this, -1, 0, rem, rem, off); - } - - public IntBuffer duplicate() { - return new DirectIntBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public IntBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public IntBuffer put(int x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer put(int i, int x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer put(IntBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer put(int[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public IntBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectIntBufferS.java b/ojluni/src/main/java/java/nio/DirectIntBufferS.java deleted file mode 100644 index 0ae86a3..0000000 --- a/ojluni/src/main/java/java/nio/DirectIntBufferS.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectIntBufferS - - extends IntBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectIntBufferS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public IntBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectIntBufferS(this, -1, 0, rem, rem, off); - } - - public IntBuffer duplicate() { - return new DirectIntBufferS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public IntBuffer asReadOnlyBuffer() { - - return new DirectIntBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 2); - } - - public int get() { - return (Bits.swap(unsafe.getInt$(ix(nextGetIndex())))); - } - - public int get(int i) { - return (Bits.swap(unsafe.getInt$(ix(checkIndex(i))))); - } - - public IntBuffer get(int[] dst, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 2, - length << 2); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public IntBuffer put(int x) { - - unsafe.putInt$(ix(nextPutIndex()), Bits.swap((x))); - return this; - - - - } - - public IntBuffer put(int i, int x) { - - unsafe.putInt$(ix(checkIndex(i)), Bits.swap((x))); - return this; - - - - } - - public IntBuffer put(IntBuffer src) { - - if (src instanceof DirectIntBufferS) { - if (src == this) - throw new IllegalArgumentException(); - DirectIntBufferS sb = (DirectIntBufferS)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public IntBuffer put(int[] src, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); - else - - Bits.copyFromArray(src, 0, offset << 2, - ix(pos), length << 2); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public IntBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 2); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectIntBufferU.java b/ojluni/src/main/java/java/nio/DirectIntBufferU.java deleted file mode 100644 index 136b592..0000000 --- a/ojluni/src/main/java/java/nio/DirectIntBufferU.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectIntBufferU - - extends IntBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectIntBufferU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public IntBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 2); - assert (off >= 0); - return new DirectIntBufferU(this, -1, 0, rem, rem, off); - } - - public IntBuffer duplicate() { - return new DirectIntBufferU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public IntBuffer asReadOnlyBuffer() { - - return new DirectIntBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 2); - } - - public int get() { - return ((unsafe.getInt$(ix(nextGetIndex())))); - } - - public int get(int i) { - return ((unsafe.getInt$(ix(checkIndex(i))))); - } - - public IntBuffer get(int[] dst, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 2, - length << 2); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public IntBuffer put(int x) { - - unsafe.putInt$(ix(nextPutIndex()), ((x))); - return this; - - - - } - - public IntBuffer put(int i, int x) { - - unsafe.putInt$(ix(checkIndex(i)), ((x))); - return this; - - - - } - - public IntBuffer put(IntBuffer src) { - - if (src instanceof DirectIntBufferU) { - if (src == this) - throw new IllegalArgumentException(); - DirectIntBufferU sb = (DirectIntBufferU)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public IntBuffer put(int[] src, int offset, int length) { - - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); - else - - Bits.copyFromArray(src, 0, offset << 2, - ix(pos), length << 2); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public IntBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 2); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectLongBufferRS.java b/ojluni/src/main/java/java/nio/DirectLongBufferRS.java deleted file mode 100644 index 106b634..0000000 --- a/ojluni/src/main/java/java/nio/DirectLongBufferRS.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectLongBufferRS - - - - extends DirectLongBufferS - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectLongBufferRS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public LongBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectLongBufferRS(this, -1, 0, rem, rem, off); - } - - public LongBuffer duplicate() { - return new DirectLongBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public LongBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public LongBuffer put(long x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer put(int i, long x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer put(LongBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer put(long[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectLongBufferRU.java b/ojluni/src/main/java/java/nio/DirectLongBufferRU.java deleted file mode 100644 index 1c0c933..0000000 --- a/ojluni/src/main/java/java/nio/DirectLongBufferRU.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectLongBufferRU - - - - extends DirectLongBufferU - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectLongBufferRU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public LongBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectLongBufferRU(this, -1, 0, rem, rem, off); - } - - public LongBuffer duplicate() { - return new DirectLongBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public LongBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public LongBuffer put(long x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer put(int i, long x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer put(LongBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer put(long[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public LongBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectLongBufferS.java b/ojluni/src/main/java/java/nio/DirectLongBufferS.java deleted file mode 100644 index 826e572..0000000 --- a/ojluni/src/main/java/java/nio/DirectLongBufferS.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectLongBufferS - - extends LongBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectLongBufferS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public LongBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectLongBufferS(this, -1, 0, rem, rem, off); - } - - public LongBuffer duplicate() { - return new DirectLongBufferS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public LongBuffer asReadOnlyBuffer() { - - return new DirectLongBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 3); - } - - public long get() { - return (Bits.swap(unsafe.getLong$(ix(nextGetIndex())))); - } - - public long get(int i) { - return (Bits.swap(unsafe.getLong$(ix(checkIndex(i))))); - } - - public LongBuffer get(long[] dst, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 3, - length << 3); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public LongBuffer put(long x) { - - unsafe.putLong$(ix(nextPutIndex()), Bits.swap((x))); - return this; - - - - } - - public LongBuffer put(int i, long x) { - - unsafe.putLong$(ix(checkIndex(i)), Bits.swap((x))); - return this; - - - - } - - public LongBuffer put(LongBuffer src) { - - if (src instanceof DirectLongBufferS) { - if (src == this) - throw new IllegalArgumentException(); - DirectLongBufferS sb = (DirectLongBufferS)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public LongBuffer put(long[] src, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); - else - - Bits.copyFromArray(src, 0, offset << 3, - ix(pos), length << 3); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public LongBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 3); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectLongBufferU.java b/ojluni/src/main/java/java/nio/DirectLongBufferU.java deleted file mode 100644 index bea222a..0000000 --- a/ojluni/src/main/java/java/nio/DirectLongBufferU.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectLongBufferU - - extends LongBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectLongBufferU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public LongBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 3); - assert (off >= 0); - return new DirectLongBufferU(this, -1, 0, rem, rem, off); - } - - public LongBuffer duplicate() { - return new DirectLongBufferU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public LongBuffer asReadOnlyBuffer() { - - return new DirectLongBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 3); - } - - public long get() { - return ((unsafe.getLong$(ix(nextGetIndex())))); - } - - public long get(int i) { - return ((unsafe.getLong$(ix(checkIndex(i))))); - } - - public LongBuffer get(long[] dst, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 3, - length << 3); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public LongBuffer put(long x) { - - unsafe.putLong$(ix(nextPutIndex()), ((x))); - return this; - - - - } - - public LongBuffer put(int i, long x) { - - unsafe.putLong$(ix(checkIndex(i)), ((x))); - return this; - - - - } - - public LongBuffer put(LongBuffer src) { - - if (src instanceof DirectLongBufferU) { - if (src == this) - throw new IllegalArgumentException(); - DirectLongBufferU sb = (DirectLongBufferU)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public LongBuffer put(long[] src, int offset, int length) { - - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); - else - - Bits.copyFromArray(src, 0, offset << 3, - ix(pos), length << 3); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public LongBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 3); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectShortBufferRS.java b/ojluni/src/main/java/java/nio/DirectShortBufferRS.java deleted file mode 100644 index 0f069bd..0000000 --- a/ojluni/src/main/java/java/nio/DirectShortBufferRS.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectShortBufferRS - - - - extends DirectShortBufferS - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectShortBufferRS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public ShortBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectShortBufferRS(this, -1, 0, rem, rem, off); - } - - public ShortBuffer duplicate() { - return new DirectShortBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public ShortBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ShortBuffer put(short x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer put(int i, short x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer put(ShortBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer put(short[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectShortBufferRU.java b/ojluni/src/main/java/java/nio/DirectShortBufferRU.java deleted file mode 100644 index 7543468..0000000 --- a/ojluni/src/main/java/java/nio/DirectShortBufferRU.java +++ /dev/null
@@ -1,484 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectShortBufferRU - - - - extends DirectShortBufferU - - implements DirectBuffer -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectShortBufferRU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - - - - - - - - super(db, mark, pos, lim, cap, off); - - } - - public ShortBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectShortBufferRU(this, -1, 0, rem, rem, off); - } - - public ShortBuffer duplicate() { - return new DirectShortBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public ShortBuffer asReadOnlyBuffer() { - - - - - - - - - return duplicate(); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ShortBuffer put(short x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer put(int i, short x) { - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer put(ShortBuffer src) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer put(short[] src, int offset, int length) { - - - - - - - - - - - - - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public ShortBuffer compact() { - - - - - - - - - - - - - throw new ReadOnlyBufferException(); - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return true; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectShortBufferS.java b/ojluni/src/main/java/java/nio/DirectShortBufferS.java deleted file mode 100644 index faf62e0..0000000 --- a/ojluni/src/main/java/java/nio/DirectShortBufferS.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectShortBufferS - - extends ShortBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectShortBufferS(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public ShortBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectShortBufferS(this, -1, 0, rem, rem, off); - } - - public ShortBuffer duplicate() { - return new DirectShortBufferS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public ShortBuffer asReadOnlyBuffer() { - - return new DirectShortBufferRS(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 1); - } - - public short get() { - return (Bits.swap(unsafe.getShort$(ix(nextGetIndex())))); - } - - public short get(int i) { - return (Bits.swap(unsafe.getShort$(ix(checkIndex(i))))); - } - - public ShortBuffer get(short[] dst, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToShortArray(ix(pos), dst, - offset << 1, - length << 1); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 1, - length << 1); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public ShortBuffer put(short x) { - - unsafe.putShort$(ix(nextPutIndex()), Bits.swap((x))); - return this; - - - - } - - public ShortBuffer put(int i, short x) { - - unsafe.putShort$(ix(checkIndex(i)), Bits.swap((x))); - return this; - - - - } - - public ShortBuffer put(ShortBuffer src) { - - if (src instanceof DirectShortBufferS) { - if (src == this) - throw new IllegalArgumentException(); - DirectShortBufferS sb = (DirectShortBufferS)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public ShortBuffer put(short[] src, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromShortArray(src, offset << 1, - ix(pos), length << 1); - else - - Bits.copyFromArray(src, 0, offset << 1, - ix(pos), length << 1); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public ShortBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 1); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - return ((ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/DirectShortBufferU.java b/ojluni/src/main/java/java/nio/DirectShortBufferU.java deleted file mode 100644 index e6890ce..0000000 --- a/ojluni/src/main/java/java/nio/DirectShortBufferU.java +++ /dev/null
@@ -1,481 +0,0 @@ -/* - * Copyright (c) 2000, 2011, 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. - */ - -// -- This file was mechanically generated: Do not edit! -- // - -package java.nio; - -import java.io.FileDescriptor; -import sun.misc.Cleaner; -import sun.misc.Unsafe; -import sun.misc.VM; -import sun.nio.ch.DirectBuffer; - - -class DirectShortBufferU - - extends ShortBuffer - - - - implements DirectBuffer -{ - - - - // Cached unsafe-access object - protected static final Unsafe unsafe = Bits.unsafe(); - - // Cached unaligned-access capability - protected static final boolean unaligned = Bits.unaligned(); - - // Base address, used in all indexing calculations - // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress - // protected long address; - - // An object attached to this buffer. If this buffer is a view of another - // buffer then we use this field to keep a reference to that buffer to - // ensure that its memory isn't freed before we are done with it. - private final Object att; - - public Object attachment() { - return att; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public Cleaner cleaner() { return null; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // For duplicates and slices - // - DirectShortBufferU(DirectBuffer db, // package-private - int mark, int pos, int lim, int cap, - int off) - { - - super(mark, pos, lim, cap); - address = db.address() + off; - - - - att = db; - - - - } - - public ShortBuffer slice() { - int pos = this.position(); - int lim = this.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << 1); - assert (off >= 0); - return new DirectShortBufferU(this, -1, 0, rem, rem, off); - } - - public ShortBuffer duplicate() { - return new DirectShortBufferU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - } - - public ShortBuffer asReadOnlyBuffer() { - - return new DirectShortBufferRU(this, - this.markValue(), - this.position(), - this.limit(), - this.capacity(), - 0); - - - - } - - - - public long address() { - return address; - } - - private long ix(int i) { - return address + (i << 1); - } - - public short get() { - return ((unsafe.getShort$(ix(nextGetIndex())))); - } - - public short get(int i) { - return ((unsafe.getShort$(ix(checkIndex(i))))); - } - - public ShortBuffer get(short[] dst, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { - checkBounds(offset, length, dst.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferUnderflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyToShortArray(ix(pos), dst, - offset << 1, - length << 1); - else - - Bits.copyToArray(ix(pos), dst, 0, - offset << 1, - length << 1); - position(pos + length); - } else { - super.get(dst, offset, length); - } - return this; - - - - } - - - - public ShortBuffer put(short x) { - - unsafe.putShort$(ix(nextPutIndex()), ((x))); - return this; - - - - } - - public ShortBuffer put(int i, short x) { - - unsafe.putShort$(ix(checkIndex(i)), ((x))); - return this; - - - - } - - public ShortBuffer put(ShortBuffer src) { - - if (src instanceof DirectShortBufferU) { - if (src == this) - throw new IllegalArgumentException(); - DirectShortBufferU sb = (DirectShortBufferU)src; - - int spos = sb.position(); - int slim = sb.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - if (srem > rem) - throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); - sb.position(spos + srem); - position(pos + srem); - } else if (src.hb != null) { - - int spos = src.position(); - int slim = src.limit(); - assert (spos <= slim); - int srem = (spos <= slim ? slim - spos : 0); - - put(src.hb, src.offset + spos, srem); - src.position(spos + srem); - - } else { - super.put(src); - } - return this; - - - - } - - public ShortBuffer put(short[] src, int offset, int length) { - - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { - checkBounds(offset, length, src.length); - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (length > rem) - throw new BufferOverflowException(); - - - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromShortArray(src, offset << 1, - ix(pos), length << 1); - else - - Bits.copyFromArray(src, 0, offset << 1, - ix(pos), length << 1); - position(pos + length); - } else { - super.put(src, offset, length); - } - return this; - - - - } - - public ShortBuffer compact() { - - int pos = position(); - int lim = limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - unsafe.copyMemory(ix(pos), ix(0), rem << 1); - position(rem); - limit(capacity()); - discardMark(); - return this; - - - - } - - public boolean isDirect() { - return true; - } - - public boolean isReadOnly() { - return false; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public ByteOrder order() { - - - - - - return ((ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) - ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); - - } - - - - - - - - - - - - - - - - - - - - - - - - - - -}
diff --git a/ojluni/src/main/java/java/nio/HeapByteBuffer.java b/ojluni/src/main/java/java/nio/HeapByteBuffer.java index 793679a..0f7b189 100644 --- a/ojluni/src/main/java/java/nio/HeapByteBuffer.java +++ b/ojluni/src/main/java/java/nio/HeapByteBuffer.java
@@ -246,8 +246,7 @@ size, size, off, - order(), - isReadOnly)); + order())); } public short getShort() { @@ -283,8 +282,7 @@ size, size, off, - order(), - isReadOnly); + order()); } public int getInt() { @@ -321,8 +319,7 @@ size, size, off, - order(), - isReadOnly)); + order())); } public long getLong() { @@ -358,8 +355,7 @@ size, size, off, - order(), - isReadOnly)); + order())); } public float getFloat() { @@ -397,8 +393,7 @@ size, size, off, - order(), - isReadOnly)); + order())); } public double getDouble() { @@ -430,23 +425,12 @@ public DoubleBuffer asDoubleBuffer() { int size = this.remaining() >> 3; int off = offset + position(); - return (bigEndian - ? (DoubleBuffer)(new ByteBufferAsDoubleBuffer(this, - -1, - 0, - size, - size, - off, - ByteOrder.BIG_ENDIAN, - isReadOnly)) - : (DoubleBuffer)(new ByteBufferAsDoubleBuffer(this, - -1, - 0, - size, - size, - off, - ByteOrder.LITTLE_ENDIAN, - isReadOnly))); - + return (DoubleBuffer)(new ByteBufferAsDoubleBuffer(this, + -1, + 0, + size, + size, + off, + order())); } }
diff --git a/openjdk_java_files.mk b/openjdk_java_files.mk index 68cf515..1bf38f6 100644 --- a/openjdk_java_files.mk +++ b/openjdk_java_files.mk
@@ -399,30 +399,6 @@ ojluni/src/main/java/java/nio/charset/UnmappableCharacterException.java \ ojluni/src/main/java/java/nio/charset/UnsupportedCharsetException.java \ ojluni/src/main/java/java/nio/DirectByteBuffer.java \ - ojluni/src/main/java/java/nio/DirectCharBufferRS.java \ - ojluni/src/main/java/java/nio/DirectCharBufferRU.java \ - ojluni/src/main/java/java/nio/DirectCharBufferS.java \ - ojluni/src/main/java/java/nio/DirectCharBufferU.java \ - ojluni/src/main/java/java/nio/DirectDoubleBufferRS.java \ - ojluni/src/main/java/java/nio/DirectDoubleBufferRU.java \ - ojluni/src/main/java/java/nio/DirectDoubleBufferS.java \ - ojluni/src/main/java/java/nio/DirectDoubleBufferU.java \ - ojluni/src/main/java/java/nio/DirectFloatBufferRS.java \ - ojluni/src/main/java/java/nio/DirectFloatBufferRU.java \ - ojluni/src/main/java/java/nio/DirectFloatBufferS.java \ - ojluni/src/main/java/java/nio/DirectFloatBufferU.java \ - ojluni/src/main/java/java/nio/DirectIntBufferRS.java \ - ojluni/src/main/java/java/nio/DirectIntBufferRU.java \ - ojluni/src/main/java/java/nio/DirectIntBufferS.java \ - ojluni/src/main/java/java/nio/DirectIntBufferU.java \ - ojluni/src/main/java/java/nio/DirectLongBufferRS.java \ - ojluni/src/main/java/java/nio/DirectLongBufferRU.java \ - ojluni/src/main/java/java/nio/DirectLongBufferS.java \ - ojluni/src/main/java/java/nio/DirectLongBufferU.java \ - ojluni/src/main/java/java/nio/DirectShortBufferRS.java \ - ojluni/src/main/java/java/nio/DirectShortBufferRU.java \ - ojluni/src/main/java/java/nio/DirectShortBufferS.java \ - ojluni/src/main/java/java/nio/DirectShortBufferU.java \ ojluni/src/main/java/java/nio/DoubleBuffer.java \ ojluni/src/main/java/java/nio/file/AccessDeniedException.java \ ojluni/src/main/java/java/nio/file/AccessMode.java \