ByteBuffer.java (endian): Make non-private so other java.nio classes can inherit it.

	* java/nio/ByteBuffer.java (endian):  Make non-private so other
	java.nio classes can inherit it.
	(<init>):  Don't bother clearing array_offset.
	* java/nio/ByteBuffer.java (allocate):  Re-implement using wrap.
	* java/nio/ByteBuffer.java (get(byte[],int,int)):  Check underflow.
	Remove redundant test.

	* java/nio/ByteBufferImpl.java (asCharBuffer, asShortBuffer,
	asIntBuffer, asLongBuffer, asFloatBuffer, asDoubleBuffer):
	Use new XxxViewBufferImpl constructors.
	* java/nio/MappedByteBufferImpl.java:  Likewise.
	* java/nio/DirectByteBufferImpl.java:  Likewise.

	* java/nio/ByteBufferImpl.java:  Remove one constructor.
	Inline super in remaining constructor.
	* java/nio/ByteBuffer.java:  Remove unused constructor.

	* java/nio/ByteBufferImpl.java (shiftDown):  New optimized method.

	* java/nio/ByteBufferImpl.java (get, put):  Add array_offset.
	* java/nio/DirectByteBufferImpl.java (owner):  New field.
	(offset):  Remove unused field.
	(<init>):  Modify one and add another constructor.  Change callers.
	(allocateDirect):  Removed - not used.
	(getImpl, putImpl):  Make static and pass address explicitly,
	to make them useful for MappedByteBufferImpl.
	(get, put):  Check for underflow.  Modify for new getImpl.
	(getImpl):  New native method where target is array.
	(get(byte[],int,int)):  Use the above.
	(adjustAddress):  New static native method.
	(slice, duplicate, asReadOnly):  New implementations.
	* java/nio/natDirectByteBufferImpl.cc (getImpl, putImpl, shiftDown,
	adjustAddress):  New or updated native methods.

From-SVN: r77919

1 files changed, 27 insertions, 8 deletions

diff --git a/libjava/java/nio/natDirectByteBufferImpl.cc b/libjava/java/nio/natDirectByteBufferImpl.cc
index 7ff06ff..94225c3 100644
--- a/libjava/java/nio/natDirectByteBufferImpl.cc
+++ b/libjava/java/nio/natDirectByteBufferImpl.cc
@@ -1,6 +1,6 @@
 // natDirectByteBufferImpl.cc
 
-/* Copyright (C) 2003  Free Software Foundation
+/* Copyright (C) 2003, 2004  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -18,7 +18,10 @@ details.  */
 #include <gnu/gcj/RawData.h>
 #include <java/nio/DirectByteBufferImpl.h>
 
-gnu::gcj::RawData*
+using gnu::gcj::RawData;
+using java::nio::DirectByteBufferImpl;
+
+RawData*
 java::nio::DirectByteBufferImpl::allocateImpl (jint capacity)
 {
   return reinterpret_cast<gnu::gcj::RawData*> (::malloc (capacity));
@@ -31,24 +34,40 @@ java::nio::DirectByteBufferImpl::freeImpl (gnu::gcj::RawData* address)
 }
 
 jbyte
-java::nio::DirectByteBufferImpl::getImpl (jint index)
+DirectByteBufferImpl::getImpl (RawData* address, jint index)
 {
-  jbyte* pointer = reinterpret_cast<jbyte*> (address) + offset + index;
+  jbyte* pointer = reinterpret_cast<jbyte*> (address) + index;
   return *pointer;
 }
 
 void
-java::nio::DirectByteBufferImpl::putImpl (jint index, jbyte value)
+DirectByteBufferImpl::getImpl (RawData* address, jint index,
+			       jbyteArray dst, jint offset, jint length)
+{
+  jbyte* src = reinterpret_cast<jbyte*> (address) + index;
+  memcpy (elements (dst) + offset, src, length);
+}
+
+void
+java::nio::DirectByteBufferImpl::putImpl (gnu::gcj::RawData* address,
+					  jint index, jbyte value)
 {
-  jbyte* pointer = reinterpret_cast<jbyte*> (address) + offset + index;
+  jbyte* pointer = reinterpret_cast<jbyte*> (address) + index;
   *pointer = value;
 }
 
+RawData*
+java::nio::DirectByteBufferImpl::adjustAddress (RawData* address, jint offset)
+{
+  jbyte* start = reinterpret_cast<jbyte*> (address) + offset;
+  return reinterpret_cast<RawData*>(start);
+}
+
 void
 java::nio::DirectByteBufferImpl::shiftDown
 (jint dst_offset, jint src_offset, jint count)
 {
-  jbyte* dst = reinterpret_cast<jbyte*> (address) + offset + dst_offset;
-  jbyte* src = reinterpret_cast<jbyte*> (address) + offset + src_offset;
+  jbyte* dst = reinterpret_cast<jbyte*> (address) + array_offset + dst_offset;
+  jbyte* src = reinterpret_cast<jbyte*> (address) + array_offset + src_offset;
   ::memmove(dst, src, count);
 }