OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Michael Koch 2003-06-17 19:09:56 +00:00 committed by Michael Koch
parent 67f63f32d5
commit 6f3aed57fb
4 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libjava/ChangeLog
View File

@ -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.

7
libjava/java/nio/DirectByteBufferImpl.java
View File

@ -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,

24
libjava/java/nio/natDirectByteBufferImpl.cc
View File

@ -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;
}

26
libjava/jni.cc
View File

@ -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();
}