2003-06-17 Michael Koch <konqueror@gmx.de>

	* java/nio/DirectByteBufferImpl.java
	(address): Made package private.
	(DirectByteBufferImpl): New constructor.
	* java/nio/natDirectByteBufferImpl.cc
	(allocateImpl): Moved to java.nio namespace, implemented.
	(freeImpl): Likewise.
	(getImpl): Likewise.
	(putImpl): Likewise.
	* jni.cc
	(_Jv_JNI_NewDirectByteBuffer): Implemented.
	(_Jv_JNI_GetDirectBufferAddress): Implemented.
	(_Jv_JNI_GetDirectBufferCapacity): Implemented.

From-SVN: r68105

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 252e6dadef54cf167334db80e7253bce1f28559d..da274367f52ae00c3f6604fc254428cde7a08549 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,18 @@
+2003-06-17  Michael Koch  <konqueror@gmx.de>
+
+       * java/nio/DirectByteBufferImpl.java
+       (address): Made package private.
+       (DirectByteBufferImpl): New constructor.
+       * java/nio/natDirectByteBufferImpl.cc
+       (allocateImpl): Moved to java.nio namespace, implemented.
+       (freeImpl): Likewise.
+       (getImpl): Likewise.
+       (putImpl): Likewise.
+       * jni.cc
+       (_Jv_JNI_NewDirectByteBuffer): Implemented.
+       (_Jv_JNI_GetDirectBufferAddress): Implemented.
+       (_Jv_JNI_GetDirectBufferCapacity): Implemented.
+
 2003-06-17  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
        * include/powerpc-signal.h: New File.

diff --git a/libjava/java/nio/DirectByteBufferImpl.java b/libjava/java/nio/DirectByteBufferImpl.java
index b037385c4af7da064034c558062ef5a7543a43ac..c746723f0d873077c77475498ce03975e8d5aaec 100644 (file)
--- a/libjava/java/nio/DirectByteBufferImpl.java
+++ b/libjava/java/nio/DirectByteBufferImpl.java
@@ -42,9 +42,14 @@ import gnu.gcj.RawData;
 
 public class DirectByteBufferImpl extends ByteBuffer
 {
-  private RawData address;
+  RawData address;
   private int offset;
   private boolean readOnly;
+
+  public DirectByteBufferImpl (RawData address, long len)
+  {
+    this (address, 0, (int) len, (int) len, 0, -1, false);
+  }
   
   public DirectByteBufferImpl (RawData address, int offset, int capacity,
                                int limit, int position, int mark,

diff --git a/libjava/java/nio/natDirectByteBufferImpl.cc b/libjava/java/nio/natDirectByteBufferImpl.cc
index 82863900256217b9daafb2d360bf834a3084300d..2ceea17055134706755d968c42e48353d441850e 100644 (file)
--- a/libjava/java/nio/natDirectByteBufferImpl.cc
+++ b/libjava/java/nio/natDirectByteBufferImpl.cc
@@ -13,33 +13,33 @@ details.  */
 #include <gcj/cni.h>
 #include <jvm.h>
 
+#include <stdlib.h>
+
 #include <gnu/gcj/RawData.h>
 #include <java/nio/DirectByteBufferImpl.h>
 
 gnu::gcj::RawData*
-java::nio::DirectByteBufferImpl::allocateImpl (jint /*capacity*/)
+java::nio::DirectByteBufferImpl::allocateImpl (jint capacity)
 {
-  // FIXME: implement this
-  return 0;
+  return reinterpret_cast<gnu::gcj::RawData*> (::malloc (capacity));
 }
 
 void
-java::nio::DirectByteBufferImpl::freeImpl (gnu::gcj::RawData* /*address*/)
+java::nio::DirectByteBufferImpl::freeImpl (gnu::gcj::RawData* address)
 {
-  // FIXME: implement this
+  ::free (reinterpret_cast<void*> (address));
 }
 
 jbyte
-java::nio::DirectByteBufferImpl::getImpl (jint /*index*/)
+java::nio::DirectByteBufferImpl::getImpl (jint index)
 {
-  // FIXME: implement this
-  // Dont forget: add offset to index
-  return 0;
+  jbyte* pointer = reinterpret_cast<jbyte*> (address) + offset + index;
+  return *pointer;
 }
 
 void
-java::nio::DirectByteBufferImpl::putImpl (jint /*index*/, jbyte /*value*/)
+java::nio::DirectByteBufferImpl::putImpl (jint index, jbyte value)
 {
-  // FIXME: implement this
-  // Dont forget: add offset to index
+  jbyte* pointer = reinterpret_cast<jbyte*> (address) + offset + index;
+  *pointer = value;
 }

diff --git a/libjava/jni.cc b/libjava/jni.cc
index 68aeb5d6bc19b9b4ec24af4712e5d0b541ca092a..81ef0f7d36acac222c291ea4d2edafcb7653918b 100644 (file)
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -35,11 +35,13 @@ details.  */
 #include <java/lang/reflect/Method.h>
 #include <java/lang/reflect/Modifier.h>
 #include <java/lang/OutOfMemoryError.h>
-#include <java/util/IdentityHashMap.h>
 #include <java/lang/Integer.h>
 #include <java/lang/ThreadGroup.h>
 #include <java/lang/Thread.h>
 #include <java/lang/IllegalAccessError.h>
+#include <java/nio/DirectByteBufferImpl.h>
+#include <java/util/IdentityHashMap.h>
+#include <gnu/gcj/RawData.h>
 
 #include <gcj/method.h>
 #include <gcj/field.h>
@@ -1720,24 +1722,28 @@ void
 // Direct byte buffers.
 
 static jobject
-(JNICALL _Jv_JNI_NewDirectByteBuffer) (JNIEnv *, void *, jlong)
+(JNICALL _Jv_JNI_NewDirectByteBuffer) (JNIEnv *, void *address, jlong length)
 {
-  // For now we don't support this.
-  return NULL;
+  using namespace gnu::gcj;
+  using namespace java::nio;
+  return new DirectByteBufferImpl (reinterpret_cast<RawData *> (address),
+                                  length);
 }
 
 static void *
-(JNICALL _Jv_JNI_GetDirectBufferAddress) (JNIEnv *, jobject)
+(JNICALL _Jv_JNI_GetDirectBufferAddress) (JNIEnv *, jobject buffer)
 {
-  // For now we don't support this.
-  return NULL;
+  using namespace java::nio;
+  DirectByteBufferImpl* bb = static_cast<DirectByteBufferImpl *> (buffer);
+  return reinterpret_cast<void *> (bb->address);
 }
 
 static jlong
-(JNICALL _Jv_JNI_GetDirectBufferCapacity) (JNIEnv *, jobject)
+(JNICALL _Jv_JNI_GetDirectBufferCapacity) (JNIEnv *, jobject buffer)
 {
-  // For now we don't support this.
-  return -1;
+  using namespace java::nio;
+  DirectByteBufferImpl* bb = static_cast<DirectByteBufferImpl *> (buffer);
+  return bb->capacity();
 }
 
 \f