From 6f3aed57fb4258b97b6c068bd7aef10f45f272d5 Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Tue, 17 Jun 2003 19:09:56 +0000
Subject: [PATCH] 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
---
libjava/ChangeLog | 15 ++++++++++++
libjava/java/nio/DirectByteBufferImpl.java | 7 +++++-
libjava/java/nio/natDirectByteBufferImpl.cc | 24 +++++++++----------
libjava/jni.cc | 26 +++++++++++++--------
4 files changed, 49 insertions(+), 23 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 252e6dadef54..da274367f52a 100644
--- 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 b037385c4af7..c746723f0d87 100644
--- 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 828639002562..2ceea1705513 100644
--- 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 68aeb5d6bc19..81ef0f7d36ac 100644
--- 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();
}
--
GitLab