diff options
| author | Per Bothner <per@bothner.com> | 2004-02-08 13:02:53 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-02-08 13:02:53 -0800 |
| commit | 40c23042f4594368c96e1af7dc65b72590d584b0 (patch) | |
| tree | a1e145e7726c0c5b674ef91a6ecd841daaa826ef /libjava/java/nio/CharViewBufferImpl.java | |
| parent | b46b8fb40cf29c5f724d87f6022c6c8242e50bf2 (diff) | |
| download | gcc-40c23042f4594368c96e1af7dc65b72590d584b0.zip gcc-40c23042f4594368c96e1af7dc65b72590d584b0.tar.gz gcc-40c23042f4594368c96e1af7dc65b72590d584b0.tar.bz2 | |
ByteBuffer.java (shiftDown): New helper method.
* java/nio/ByteBuffer.java (shiftDown): New helper method.
* java/nio/natDirectByteBufferImpl.cc (shiftDown): New implementation.
* java/nio/ByteBufferImpl.java (compact): Use new shiftDown method.
* sava/nio/ByteBufferHelper.java: Remove redundant 'final' specifiers.
Pass ByteOrder parameter to most methods, since the underlying
ByteBuffer's order isn't always what we should use.
* java/nio/ByteBufferImpl.java: Pass byte-order various places.
* java/nio/DirectByteBufferImpl.java: Likewise.
Use ByteBufferHelper methods.
* java/nio/MappedByteBufferImpl.java: Likewise.
(compact): Use shiftDown.
* java/nio/CharViewBufferImpl.java (<init>): Pass byte-order.
(get, put): Use ByteBufferHelper.
(compact): Use new shiftDown method.
(duplicate(boolean)): New helper method.
(duplicate, asReadOnlyBuffer): Use it.
(order): Return endian field.
* java/nio/DoubleViewBufferImpl.java: Likewise.
* java/nio/FloatViewBufferImpl.java: Likewise.
* java/nio/IntViewBufferImpl.java: Likewise.
* java/nio/LongViewBufferImpl.java: Likewise.
* java/nio/ShortViewBufferImpl.java: Likewise.
* java/nio/CharViewBufferImpl.java (subsequence): Redundant test.
* java/nio/DirectByteBufferImpl.java (shiftDown): New native method.
(compact): Re-implement using shiftDown.
From-SVN: r77501
Diffstat (limited to 'libjava/java/nio/CharViewBufferImpl.java')
| -rw-r--r-- | libjava/java/nio/CharViewBufferImpl.java | 94 |
1 files changed, 41 insertions, 53 deletions
diff --git a/libjava/java/nio/CharViewBufferImpl.java b/libjava/java/nio/CharViewBufferImpl.java index 6da6d59..b1cc907 100644 --- a/libjava/java/nio/CharViewBufferImpl.java +++ b/libjava/java/nio/CharViewBufferImpl.java @@ -1,5 +1,5 @@ /* CharViewBufferImpl.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,54 +40,47 @@ package java.nio; class CharViewBufferImpl extends CharBuffer { - private boolean readOnly; + /** Position in bb (i.e. a byte offset) where this buffer starts. */ private int offset; private ByteBuffer bb; + private boolean readOnly; private ByteOrder endian; - public CharViewBufferImpl (ByteBuffer bb, boolean readOnly) - { - super (bb.remaining () >> 1, bb.remaining () >> 1, bb.position (), 0); - this.bb = bb; - this.readOnly = readOnly; - // FIXME: What if this is called from CharByteBufferImpl and ByteBuffer has changed its endianess ? - this.endian = bb.order (); - } - public CharViewBufferImpl (ByteBuffer bb, int offset, int capacity, - int limit, int position, int mark, - boolean readOnly) + int limit, int position, int mark, + boolean readOnly, ByteOrder endian) { super (limit >> 1, limit >> 1, position >> 1, mark >> 1); this.bb = bb; this.offset = offset; this.readOnly = readOnly; - // FIXME: What if this is called from CharViewBufferImpl and ByteBuffer has changed its endianess ? - this.endian = bb.order (); + this.endian = endian; } public char get () { - char result = bb.getChar ((position () << 1) + offset); - position (position () + 1); + int p = position(); + char result = ByteBufferHelper.getChar(bb, (p << 1) + offset, endian); + position(p + 1); return result; } public char get (int index) { - return bb.getChar ((index << 1) + offset); + return ByteBufferHelper.getChar(bb, (index << 1) + offset, endian); } public CharBuffer put (char value) { - bb.putChar ((position () << 1) + offset, value); - position (position () + 1); + int p = position(); + ByteBufferHelper.putChar(bb, (p << 1) + offset, value, endian); + position(p + 1); return this; } public CharBuffer put (int index, char value) { - bb.putChar ((index << 1) + offset, value); + ByteBufferHelper.putChar(bb, (index << 1) + offset, value, endian); return this; } @@ -95,59 +88,54 @@ class CharViewBufferImpl extends CharBuffer { if (position () > 0) { - // Copy all data from position() to limit() to the beginning of the - // buffer, set position to end of data and limit to capacity - // XXX: This can surely be optimized, for direct and non-direct buffers - int count = limit () - position (); - - for (int i = 0; i < count; i++) - { - bb.putChar ((i >> 1) + offset, - bb.getChar (((i + position ()) >> 1) + offset)); - } - + bb.shiftDown(offset, offset + 2 * position(), 2 * count); position (count); limit (capacity ()); } - return this; } - public CharBuffer duplicate () - { - // Create a copy of this object that shares its content - // FIXME: mark is not correct - return new CharViewBufferImpl (bb, offset, capacity (), limit (), - position (), -1, isReadOnly ()); - } - public CharBuffer slice () { // Create a sliced copy of this object that shares its content. return new CharViewBufferImpl (bb, (position () >> 1) + offset, - remaining (), remaining (), 0, -1, - isReadOnly ()); + remaining (), remaining (), 0, -1, + isReadOnly (), endian); } + CharBuffer duplicate (boolean readOnly) + { + int pos = position(); + reset(); + int mark = position(); + position(pos); + return new CharViewBufferImpl (bb, offset, capacity(), limit(), + pos, mark, readOnly, endian); + } + + public CharBuffer duplicate () + { + return duplicate(readOnly); + } + + public CharBuffer asReadOnlyBuffer () + { + return duplicate(true); + } + public CharSequence subSequence (int start, int end) { if (start < 0 - || start > length () || end < start || end > length ()) throw new IndexOutOfBoundsException (); - return new CharViewBufferImpl (bb, array_offset, capacity (), position () + end, position () + start, -1, isReadOnly ()); + return new CharViewBufferImpl (bb, array_offset, capacity (), + position () + end, position () + start, + -1, isReadOnly (), endian); } - public CharBuffer asReadOnlyBuffer () - { - // Create a copy of this object that shares its content and is read-only - return new CharViewBufferImpl (bb, (position () >> 1) + offset, - remaining (), remaining (), 0, -1, true); - } - public boolean isReadOnly () { return readOnly; @@ -160,6 +148,6 @@ class CharViewBufferImpl extends CharBuffer public ByteOrder order () { - return ByteOrder.LITTLE_ENDIAN; + return endian; } } |