X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fjni.cc;h=62a96ce9c6f69eff90b1f469476c6f50eaeec9bd;hb=f064ebd17debbb055d5cb445176fea22ea1eedbb;hp=c8ccee7b65a1af82d2bc30e6b4de53a600f693a9;hpb=5aea2c55a9ec5db0a3159aa12ba14f0795b32bc1;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/jni.cc b/libjava/jni.cc index c8ccee7b65a..62a96ce9c6f 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1,6 +1,7 @@ // jni.cc - JNI implementation, including the jump table. -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation This file is part of libgcj. @@ -10,12 +11,10 @@ details. */ #include +#include #include #include -// Define this before including jni.h. -#define __GCJ_JNI_IMPL__ - #include #include #include @@ -29,7 +28,8 @@ details. */ #include #include #include -#include +#include +#include #include #include #include @@ -37,10 +37,16 @@ details. */ #include #include #include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -48,6 +54,8 @@ details. */ #include #include +using namespace gcj; + // This enum is used to select different template instantiations in // the invocation code. enum invocation_type @@ -64,7 +72,7 @@ extern struct JNIInvokeInterface _Jv_JNI_InvokeFunctions; // Number of slots in the default frame. The VM must allow at least // 16. -#define FRAME_SIZE 32 +#define FRAME_SIZE 16 // Mark value indicating this is an overflow frame. #define MARK_NONE 0 @@ -78,10 +86,13 @@ struct _Jv_JNI_LocalFrame { // This is true if this frame object represents a pushed frame (eg // from PushLocalFrame). - int marker : 2; + int marker; + + // Flag to indicate some locals were allocated. + int allocated_p; // Number of elements in frame. - int size : 30; + int size; // Next frame in chain. _Jv_JNI_LocalFrame *next; @@ -91,9 +102,9 @@ struct _Jv_JNI_LocalFrame }; // This holds a reference count for all local references. -static java::util::Hashtable *local_ref_table; +static java::util::IdentityHashMap *local_ref_table; // This holds a reference count for all global references. -static java::util::Hashtable *global_ref_table; +static java::util::IdentityHashMap *global_ref_table; // The only VM. static JavaVM *the_vm; @@ -110,19 +121,19 @@ jvmpiEnableEvent (jint event_type, void *) case JVMPI_EVENT_OBJECT_ALLOC: _Jv_JVMPI_Notify_OBJECT_ALLOC = _Jv_JVMPI_Interface.NotifyEvent; break; - + case JVMPI_EVENT_THREAD_START: _Jv_JVMPI_Notify_THREAD_START = _Jv_JVMPI_Interface.NotifyEvent; break; - + case JVMPI_EVENT_THREAD_END: _Jv_JVMPI_Notify_THREAD_END = _Jv_JVMPI_Interface.NotifyEvent; break; - + default: return JVMPI_NOT_AVAILABLE; } - + return JVMPI_SUCCESS; } @@ -134,11 +145,11 @@ jvmpiDisableEvent (jint event_type, void *) case JVMPI_EVENT_OBJECT_ALLOC: _Jv_JVMPI_Notify_OBJECT_ALLOC = NULL; break; - + default: return JVMPI_NOT_AVAILABLE; } - + return JVMPI_SUCCESS; } #endif @@ -148,8 +159,8 @@ jvmpiDisableEvent (jint event_type, void *) void _Jv_JNI_Init (void) { - local_ref_table = new java::util::Hashtable; - global_ref_table = new java::util::Hashtable; + local_ref_table = new java::util::IdentityHashMap; + global_ref_table = new java::util::IdentityHashMap; #ifdef ENABLE_JVMPI _Jv_JVMPI_Interface.version = 1; @@ -163,7 +174,7 @@ _Jv_JNI_Init (void) // Tell the GC that a certain pointer is live. static void -mark_for_gc (jobject obj, java::util::Hashtable *ref_table) +mark_for_gc (jobject obj, java::util::IdentityHashMap *ref_table) { JvSynchronize sync (ref_table); @@ -176,7 +187,7 @@ mark_for_gc (jobject obj, java::util::Hashtable *ref_table) // Unmark a pointer. static void -unmark_for_gc (jobject obj, java::util::Hashtable *ref_table) +unmark_for_gc (jobject obj, java::util::IdentityHashMap *ref_table) { JvSynchronize sync (ref_table); @@ -192,29 +203,65 @@ unmark_for_gc (jobject obj, java::util::Hashtable *ref_table) ref_table->put (obj, new Integer (val)); } +// "Unwrap" some random non-reference type. This exists to simplify +// other template functions. +template +static T +unwrap (T val) +{ + return val; +} + +// Unwrap a weak reference, if required. +template +static T * +unwrap (T *obj) +{ + using namespace gnu::gcj::runtime; + // We can compare the class directly because JNIWeakRef is `final'. + // Doing it this way is much faster. + if (obj == NULL || obj->getClass () != &JNIWeakRef::class$) + return obj; + JNIWeakRef *wr = reinterpret_cast (obj); + return reinterpret_cast (wr->get ()); +} + +jobject +_Jv_UnwrapJNIweakReference (jobject obj) +{ + return unwrap (obj); +} + -static jobject +static jobject JNICALL _Jv_JNI_NewGlobalRef (JNIEnv *, jobject obj) { + // This seems weird but I think it is correct. + obj = unwrap (obj); mark_for_gc (obj, global_ref_table); return obj; } -static void +static void JNICALL _Jv_JNI_DeleteGlobalRef (JNIEnv *, jobject obj) { + // This seems weird but I think it is correct. + obj = unwrap (obj); unmark_for_gc (obj, global_ref_table); } -static void +static void JNICALL _Jv_JNI_DeleteLocalRef (JNIEnv *env, jobject obj) { _Jv_JNI_LocalFrame *frame; + // This seems weird but I think it is correct. + obj = unwrap (obj); + for (frame = env->locals; frame != NULL; frame = frame->next) { - for (int i = 0; i < FRAME_SIZE; ++i) + for (int i = 0; i < frame->size; ++i) { if (frame->vec[i] == obj) { @@ -231,7 +278,7 @@ _Jv_JNI_DeleteLocalRef (JNIEnv *env, jobject obj) JvAssert (0); } -static jint +static jint JNICALL _Jv_JNI_EnsureLocalCapacity (JNIEnv *env, jint size) { // It is easier to just always allocate a new frame of the requested @@ -252,6 +299,7 @@ _Jv_JNI_EnsureLocalCapacity (JNIEnv *env, jint size) frame->marker = MARK_NONE; frame->size = size; + frame->allocated_p = 0; memset (&frame->vec[0], 0, size * sizeof (jobject)); frame->next = env->locals; env->locals = frame; @@ -259,7 +307,7 @@ _Jv_JNI_EnsureLocalCapacity (JNIEnv *env, jint size) return 0; } -static jint +static jint JNICALL _Jv_JNI_PushLocalFrame (JNIEnv *env, jint size) { jint r = _Jv_JNI_EnsureLocalCapacity (env, size); @@ -272,9 +320,12 @@ _Jv_JNI_PushLocalFrame (JNIEnv *env, jint size) return 0; } -static jobject +static jobject JNICALL _Jv_JNI_NewLocalRef (JNIEnv *env, jobject obj) { + // This seems weird but I think it is correct. + obj = unwrap (obj); + // Try to find an open slot somewhere in the topmost frame. _Jv_JNI_LocalFrame *frame = env->locals; bool done = false, set = false; @@ -287,13 +338,14 @@ _Jv_JNI_NewLocalRef (JNIEnv *env, jobject obj) set = true; done = true; frame->vec[i] = obj; + frame->allocated_p = 1; break; } } // If we found a slot, or if the frame we just searched is the // mark frame, then we are done. - if (done || frame->marker != MARK_NONE) + if (done || frame == NULL || frame->marker != MARK_NONE) break; } @@ -304,20 +356,21 @@ _Jv_JNI_NewLocalRef (JNIEnv *env, jobject obj) _Jv_JNI_EnsureLocalCapacity (env, 16); // We know the first element of the new frame will be ok. env->locals->vec[0] = obj; + env->locals->allocated_p = 1; } mark_for_gc (obj, local_ref_table); return obj; } -static jobject +static jobject JNICALL _Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result, int stop) { _Jv_JNI_LocalFrame *rf = env->locals; bool done = false; while (rf != NULL && ! done) - { + { for (int i = 0; i < rf->size; ++i) if (rf->vec[i] != NULL) unmark_for_gc (rf->vec[i], local_ref_table); @@ -326,12 +379,14 @@ _Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result, int stop) done = (rf->marker == stop); _Jv_JNI_LocalFrame *n = rf->next; - // When N==NULL, we've reached the stack-allocated frame, and we - // must not free it. However, we must be sure to clear all its - // elements, since we might conceivably reuse it. + // When N==NULL, we've reached the reusable bottom_locals, and we must + // not free it. However, we must be sure to clear all its elements. if (n == NULL) { - memset (&rf->vec[0], 0, rf->size * sizeof (jobject)); + if (rf->allocated_p) + memset (&rf->vec[0], 0, rf->size * sizeof (jobject)); + rf->allocated_p = 0; + rf = NULL; break; } @@ -345,20 +400,44 @@ _Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result, int stop) return result == NULL ? NULL : _Jv_JNI_NewLocalRef (env, result); } -static jobject +static jobject JNICALL _Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result) { return _Jv_JNI_PopLocalFrame (env, result, MARK_USER); } +// Make sure an array's type is compatible with the type of the +// destination. +template +static bool +_Jv_JNI_check_types (JNIEnv *env, JArray *array, jclass K) +{ + jclass klass = array->getClass()->getComponentType(); + if (__builtin_expect (klass != K, false)) + { + env->ex = new java::lang::IllegalAccessError (); + return false; + } + else + return true; +} + // Pop a `system' frame from the stack. This is `extern "C"' as it is // used by the compiler. extern "C" void _Jv_JNI_PopSystemFrame (JNIEnv *env) { - _Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM); + // Only enter slow path when we're not at the bottom, or there have been + // allocations. Usually this is false and we can just null out the locals + // field. - if (env->ex) + if (__builtin_expect ((env->locals->next + || env->locals->allocated_p), false)) + _Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM); + else + env->locals = NULL; + + if (__builtin_expect (env->ex != NULL, false)) { jthrowable t = env->ex; env->ex = NULL; @@ -366,6 +445,18 @@ _Jv_JNI_PopSystemFrame (JNIEnv *env) } } +template T extract_from_jvalue(jvalue const & t); +template<> jboolean extract_from_jvalue(jvalue const & jv) { return jv.z; } +template<> jbyte extract_from_jvalue(jvalue const & jv) { return jv.b; } +template<> jchar extract_from_jvalue(jvalue const & jv) { return jv.c; } +template<> jshort extract_from_jvalue(jvalue const & jv) { return jv.s; } +template<> jint extract_from_jvalue(jvalue const & jv) { return jv.i; } +template<> jlong extract_from_jvalue(jvalue const & jv) { return jv.j; } +template<> jfloat extract_from_jvalue(jvalue const & jv) { return jv.f; } +template<> jdouble extract_from_jvalue(jvalue const & jv) { return jv.d; } +template<> jobject extract_from_jvalue(jvalue const & jv) { return jv.l; } + + // This function is used from other template functions. It wraps the // return value appropriately; we specialize it so that object returns // are turned into local references. @@ -378,7 +469,7 @@ wrap_value (JNIEnv *, T value) // This specialization is used for jobject, jclass, jstring, jarray, // etc. -template +template static T * wrap_value (JNIEnv *env, T *value) { @@ -389,18 +480,21 @@ wrap_value (JNIEnv *env, T *value) -static jint +static jint JNICALL _Jv_JNI_GetVersion (JNIEnv *) { - return JNI_VERSION_1_2; + return JNI_VERSION_1_4; } -static jclass -_Jv_JNI_DefineClass (JNIEnv *env, jobject loader, +static jclass JNICALL +_Jv_JNI_DefineClass (JNIEnv *env, const char *name, jobject loader, const jbyte *buf, jsize bufLen) { try { + loader = unwrap (loader); + + jstring sname = JvNewStringUTF (name); jbyteArray bytes = JvNewByteArray (bufLen); jbyte *elts = elements (bytes); @@ -409,7 +503,7 @@ _Jv_JNI_DefineClass (JNIEnv *env, jobject loader, java::lang::ClassLoader *l = reinterpret_cast (loader); - jclass result = l->defineClass (bytes, 0, bufLen); + jclass result = l->defineClass (sname, bytes, 0, bufLen); return (jclass) wrap_value (env, result); } catch (jthrowable t) @@ -419,7 +513,7 @@ _Jv_JNI_DefineClass (JNIEnv *env, jobject loader, } } -static jclass +static jclass JNICALL _Jv_JNI_FindClass (JNIEnv *env, const char *name) { // FIXME: assume that NAME isn't too long. @@ -436,7 +530,7 @@ _Jv_JNI_FindClass (JNIEnv *env, const char *name) java::lang::ClassLoader *loader = NULL; if (env->klass != NULL) - loader = env->klass->getClassLoader (); + loader = env->klass->getClassLoaderInternal (); if (loader == NULL) { @@ -455,32 +549,34 @@ _Jv_JNI_FindClass (JNIEnv *env, const char *name) return (jclass) wrap_value (env, r); } -static jclass +static jclass JNICALL _Jv_JNI_GetSuperclass (JNIEnv *env, jclass clazz) { - return (jclass) wrap_value (env, clazz->getSuperclass ()); + return (jclass) wrap_value (env, unwrap (clazz)->getSuperclass ()); } -static jboolean -_Jv_JNI_IsAssignableFrom(JNIEnv *, jclass clazz1, jclass clazz2) +static jboolean JNICALL +_Jv_JNI_IsAssignableFrom (JNIEnv *, jclass clazz1, jclass clazz2) { - return clazz1->isAssignableFrom (clazz2); + return unwrap (clazz2)->isAssignableFrom (unwrap (clazz1)); } -static jint +static jint JNICALL _Jv_JNI_Throw (JNIEnv *env, jthrowable obj) { // We check in case the user did some funky cast. + obj = unwrap (obj); JvAssert (obj != NULL && java::lang::Throwable::class$.isInstance (obj)); env->ex = obj; return 0; } -static jint +static jint JNICALL _Jv_JNI_ThrowNew (JNIEnv *env, jclass clazz, const char *message) { using namespace java::lang::reflect; + clazz = unwrap (clazz); JvAssert (java::lang::Throwable::class$.isAssignableFrom (clazz)); int r = JNI_OK; @@ -491,11 +587,12 @@ _Jv_JNI_ThrowNew (JNIEnv *env, jclass clazz, const char *message) NULL); jclass *elts = elements (argtypes); - elts[0] = &StringClass; + elts[0] = &java::lang::String::class$; Constructor *cons = clazz->getConstructor (argtypes); - jobjectArray values = JvNewObjectArray (1, &StringClass, NULL); + jobjectArray values = JvNewObjectArray (1, &java::lang::String::class$, + NULL); jobject *velts = elements (values); velts[0] = JvNewStringUTF (message); @@ -512,32 +609,32 @@ _Jv_JNI_ThrowNew (JNIEnv *env, jclass clazz, const char *message) return r; } -static jthrowable +static jthrowable JNICALL _Jv_JNI_ExceptionOccurred (JNIEnv *env) { return (jthrowable) wrap_value (env, env->ex); } -static void +static void JNICALL _Jv_JNI_ExceptionDescribe (JNIEnv *env) { if (env->ex != NULL) env->ex->printStackTrace(); } -static void +static void JNICALL _Jv_JNI_ExceptionClear (JNIEnv *env) { env->ex = NULL; } -static jboolean +static jboolean JNICALL _Jv_JNI_ExceptionCheck (JNIEnv *env) { return env->ex != NULL; } -static void +static void JNICALL _Jv_JNI_FatalError (JNIEnv *, const char *message) { JvFail (message); @@ -545,13 +642,13 @@ _Jv_JNI_FatalError (JNIEnv *, const char *message) -static jboolean +static jboolean JNICALL _Jv_JNI_IsSameObject (JNIEnv *, jobject obj1, jobject obj2) { - return obj1 == obj2; + return unwrap (obj1) == unwrap (obj2); } -static jobject +static jobject JNICALL _Jv_JNI_AllocObject (JNIEnv *env, jclass clazz) { jobject obj = NULL; @@ -559,14 +656,12 @@ _Jv_JNI_AllocObject (JNIEnv *env, jclass clazz) try { + clazz = unwrap (clazz); JvAssert (clazz && ! clazz->isArray ()); if (clazz->isInterface() || Modifier::isAbstract(clazz->getModifiers())) env->ex = new java::lang::InstantiationException (); else - { - // FIXME: will this work for String? - obj = JvAllocObject (clazz); - } + obj = _Jv_AllocObject (clazz); } catch (jthrowable t) { @@ -576,17 +671,18 @@ _Jv_JNI_AllocObject (JNIEnv *env, jclass clazz) return wrap_value (env, obj); } -static jclass +static jclass JNICALL _Jv_JNI_GetObjectClass (JNIEnv *env, jobject obj) { + obj = unwrap (obj); JvAssert (obj); return (jclass) wrap_value (env, obj->getClass()); } -static jboolean +static jboolean JNICALL _Jv_JNI_IsInstanceOf (JNIEnv *, jobject obj, jclass clazz) { - return clazz->isInstance(obj); + return unwrap (clazz)->isInstance(unwrap (obj)); } @@ -596,12 +692,13 @@ _Jv_JNI_IsInstanceOf (JNIEnv *, jobject obj, jclass clazz) // template -static jmethodID +static jmethodID JNICALL _Jv_JNI_GetAnyMethodID (JNIEnv *env, jclass clazz, const char *name, const char *sig) { try { + clazz = unwrap (clazz); _Jv_InitClass (clazz); _Jv_Utf8Const *name_u = _Jv_makeUtf8Const ((char *) name, -1); @@ -636,7 +733,10 @@ _Jv_JNI_GetAnyMethodID (JNIEnv *env, jclass clazz, clazz = clazz->getSuperclass (); } - env->ex = new java::lang::NoSuchMethodError (); + java::lang::StringBuffer *name_sig = + new java::lang::StringBuffer (JvNewStringUTF (name)); + name_sig->append ((jchar) ' ')->append (JvNewStringUTF (s)); + env->ex = new java::lang::NoSuchMethodError (name_sig->toString ()); } catch (jthrowable t) { @@ -655,26 +755,35 @@ array_from_valist (jvalue *values, JArray *arg_types, va_list vargs) jclass *arg_elts = elements (arg_types); for (int i = 0; i < arg_types->length; ++i) { + // Here we assume that sizeof(int) >= sizeof(jint), because we + // use `int' when decoding the varargs. Likewise for + // float, and double. Also we assume that sizeof(jlong) >= + // sizeof(int), i.e. that jlong values are not further + // promoted. + JvAssert (sizeof (int) >= sizeof (jint)); + JvAssert (sizeof (jlong) >= sizeof (int)); + JvAssert (sizeof (double) >= sizeof (jfloat)); + JvAssert (sizeof (double) >= sizeof (jdouble)); if (arg_elts[i] == JvPrimClass (byte)) - values[i].b = va_arg (vargs, jbyte); + values[i].b = (jbyte) va_arg (vargs, int); else if (arg_elts[i] == JvPrimClass (short)) - values[i].s = va_arg (vargs, jshort); + values[i].s = (jshort) va_arg (vargs, int); else if (arg_elts[i] == JvPrimClass (int)) - values[i].i = va_arg (vargs, jint); + values[i].i = (jint) va_arg (vargs, int); else if (arg_elts[i] == JvPrimClass (long)) - values[i].j = va_arg (vargs, jlong); + values[i].j = (jlong) va_arg (vargs, jlong); else if (arg_elts[i] == JvPrimClass (float)) - values[i].f = va_arg (vargs, jfloat); + values[i].f = (jfloat) va_arg (vargs, double); else if (arg_elts[i] == JvPrimClass (double)) - values[i].d = va_arg (vargs, jdouble); + values[i].d = (jdouble) va_arg (vargs, double); else if (arg_elts[i] == JvPrimClass (boolean)) - values[i].z = va_arg (vargs, jboolean); + values[i].z = (jboolean) va_arg (vargs, int); else if (arg_elts[i] == JvPrimClass (char)) - values[i].c = va_arg (vargs, jchar); + values[i].c = (jchar) va_arg (vargs, int); else { // An object. - values[i].l = va_arg (vargs, jobject); + values[i].l = unwrap (va_arg (vargs, jobject)); } } } @@ -682,12 +791,12 @@ array_from_valist (jvalue *values, JArray *arg_types, va_list vargs) // This can call any sort of method: virtual, "nonvirtual", static, or // constructor. template -static T +static T JNICALL _Jv_JNI_CallAnyMethodV (JNIEnv *env, jobject obj, jclass klass, jmethodID id, va_list vargs) { - if (style == normal) - id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature); + obj = unwrap (obj); + klass = unwrap (klass); jclass decl_class = klass ? klass : obj->getClass (); JvAssert (decl_class != NULL); @@ -708,15 +817,12 @@ _Jv_JNI_CallAnyMethodV (JNIEnv *env, jobject obj, jclass klass, return_type = klass; jvalue result; - jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id, - style == constructor, - arg_types, args, &result); + _Jv_CallAnyMethodA (obj, return_type, id, + style == constructor, + style == normal, + arg_types, args, &result); - if (ex != NULL) - env->ex = ex; - - // We cheat a little here. FIXME. - return wrap_value (env, * (T *) &result); + return wrap_value (env, extract_from_jvalue(result)); } catch (jthrowable t) { @@ -727,7 +833,7 @@ _Jv_JNI_CallAnyMethodV (JNIEnv *env, jobject obj, jclass klass, } template -static T +static T JNICALL _Jv_JNI_CallAnyMethod (JNIEnv *env, jobject obj, jclass klass, jmethodID method, ...) { @@ -742,12 +848,12 @@ _Jv_JNI_CallAnyMethod (JNIEnv *env, jobject obj, jclass klass, } template -static T +static T JNICALL _Jv_JNI_CallAnyMethodA (JNIEnv *env, jobject obj, jclass klass, jmethodID id, jvalue *args) { - if (style == normal) - id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature); + obj = unwrap (obj); + klass = unwrap (klass); jclass decl_class = klass ? klass : obj->getClass (); JvAssert (decl_class != NULL); @@ -763,16 +869,24 @@ _Jv_JNI_CallAnyMethodA (JNIEnv *env, jobject obj, jclass klass, if (style == constructor) return_type = klass; - jvalue result; - jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id, - style == constructor, - arg_types, args, &result); + // Unwrap arguments as required. Eww. + jclass *type_elts = elements (arg_types); + jvalue arg_copy[arg_types->length]; + for (int i = 0; i < arg_types->length; ++i) + { + if (type_elts[i]->isPrimitive ()) + arg_copy[i] = args[i]; + else + arg_copy[i].l = unwrap (args[i].l); + } - if (ex != NULL) - env->ex = ex; + jvalue result; + _Jv_CallAnyMethodA (obj, return_type, id, + style == constructor, + style == normal, + arg_types, arg_copy, &result); - // We cheat a little here. FIXME. - return wrap_value (env, * (T *) &result); + return wrap_value (env, extract_from_jvalue(result)); } catch (jthrowable t) { @@ -783,12 +897,12 @@ _Jv_JNI_CallAnyMethodA (JNIEnv *env, jobject obj, jclass klass, } template -static void +static void JNICALL _Jv_JNI_CallAnyVoidMethodV (JNIEnv *env, jobject obj, jclass klass, jmethodID id, va_list vargs) { - if (style == normal) - id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature); + obj = unwrap (obj); + klass = unwrap (klass); jclass decl_class = klass ? klass : obj->getClass (); JvAssert (decl_class != NULL); @@ -807,12 +921,10 @@ _Jv_JNI_CallAnyVoidMethodV (JNIEnv *env, jobject obj, jclass klass, if (style == constructor) return_type = klass; - jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id, - style == constructor, - arg_types, args, NULL); - - if (ex != NULL) - env->ex = ex; + _Jv_CallAnyMethodA (obj, return_type, id, + style == constructor, + style == normal, + arg_types, args, NULL); } catch (jthrowable t) { @@ -821,7 +933,7 @@ _Jv_JNI_CallAnyVoidMethodV (JNIEnv *env, jobject obj, jclass klass, } template -static void +static void JNICALL _Jv_JNI_CallAnyVoidMethod (JNIEnv *env, jobject obj, jclass klass, jmethodID method, ...) { @@ -833,13 +945,10 @@ _Jv_JNI_CallAnyVoidMethod (JNIEnv *env, jobject obj, jclass klass, } template -static void +static void JNICALL _Jv_JNI_CallAnyVoidMethodA (JNIEnv *env, jobject obj, jclass klass, jmethodID id, jvalue *args) { - if (style == normal) - id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature); - jclass decl_class = klass ? klass : obj->getClass (); JvAssert (decl_class != NULL); @@ -850,12 +959,21 @@ _Jv_JNI_CallAnyVoidMethodA (JNIEnv *env, jobject obj, jclass klass, _Jv_GetTypesFromSignature (id, decl_class, &arg_types, &return_type); - jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id, - style == constructor, - arg_types, args, NULL); + // Unwrap arguments as required. Eww. + jclass *type_elts = elements (arg_types); + jvalue arg_copy[arg_types->length]; + for (int i = 0; i < arg_types->length; ++i) + { + if (type_elts[i]->isPrimitive ()) + arg_copy[i] = args[i]; + else + arg_copy[i].l = unwrap (args[i].l); + } - if (ex != NULL) - env->ex = ex; + _Jv_CallAnyMethodA (obj, return_type, id, + style == constructor, + style == normal, + arg_types, args, NULL); } catch (jthrowable t) { @@ -866,8 +984,9 @@ _Jv_JNI_CallAnyVoidMethodA (JNIEnv *env, jobject obj, jclass klass, // Functions with this signature are used to implement functions in // the CallMethod family. template -static T -_Jv_JNI_CallMethodV (JNIEnv *env, jobject obj, jmethodID id, va_list args) +static T JNICALL +_Jv_JNI_CallMethodV (JNIEnv *env, jobject obj, + jmethodID id, va_list args) { return _Jv_JNI_CallAnyMethodV (env, obj, NULL, id, args); } @@ -875,7 +994,7 @@ _Jv_JNI_CallMethodV (JNIEnv *env, jobject obj, jmethodID id, va_list args) // Functions with this signature are used to implement functions in // the CallMethod family. template -static T +static T JNICALL _Jv_JNI_CallMethod (JNIEnv *env, jobject obj, jmethodID id, ...) { va_list args; @@ -891,19 +1010,21 @@ _Jv_JNI_CallMethod (JNIEnv *env, jobject obj, jmethodID id, ...) // Functions with this signature are used to implement functions in // the CallMethod family. template -static T -_Jv_JNI_CallMethodA (JNIEnv *env, jobject obj, jmethodID id, jvalue *args) +static T JNICALL +_Jv_JNI_CallMethodA (JNIEnv *env, jobject obj, + jmethodID id, jvalue *args) { return _Jv_JNI_CallAnyMethodA (env, obj, NULL, id, args); } -static void -_Jv_JNI_CallVoidMethodV (JNIEnv *env, jobject obj, jmethodID id, va_list args) +static void JNICALL +_Jv_JNI_CallVoidMethodV (JNIEnv *env, jobject obj, + jmethodID id, va_list args) { _Jv_JNI_CallAnyVoidMethodV (env, obj, NULL, id, args); } -static void +static void JNICALL _Jv_JNI_CallVoidMethod (JNIEnv *env, jobject obj, jmethodID id, ...) { va_list args; @@ -913,8 +1034,9 @@ _Jv_JNI_CallVoidMethod (JNIEnv *env, jobject obj, jmethodID id, ...) va_end (args); } -static void -_Jv_JNI_CallVoidMethodA (JNIEnv *env, jobject obj, jmethodID id, jvalue *args) +static void JNICALL +_Jv_JNI_CallVoidMethodA (JNIEnv *env, jobject obj, + jmethodID id, jvalue *args) { _Jv_JNI_CallAnyVoidMethodA (env, obj, NULL, id, args); } @@ -922,12 +1044,12 @@ _Jv_JNI_CallVoidMethodA (JNIEnv *env, jobject obj, jmethodID id, jvalue *args) // Functions with this signature are used to implement functions in // the CallStaticMethod family. template -static T +static T JNICALL _Jv_JNI_CallStaticMethodV (JNIEnv *env, jclass klass, jmethodID id, va_list args) { JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC)); - JvAssert (java::lang::Class::class$.isInstance (klass)); + JvAssert (java::lang::Class::class$.isInstance (unwrap (klass))); return _Jv_JNI_CallAnyMethodV (env, NULL, klass, id, args); } @@ -935,14 +1057,15 @@ _Jv_JNI_CallStaticMethodV (JNIEnv *env, jclass klass, // Functions with this signature are used to implement functions in // the CallStaticMethod family. template -static T -_Jv_JNI_CallStaticMethod (JNIEnv *env, jclass klass, jmethodID id, ...) +static T JNICALL +_Jv_JNI_CallStaticMethod (JNIEnv *env, jclass klass, + jmethodID id, ...) { va_list args; T result; JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC)); - JvAssert (java::lang::Class::class$.isInstance (klass)); + JvAssert (java::lang::Class::class$.isInstance (unwrap (klass))); va_start (args, id); result = _Jv_JNI_CallAnyMethodV (env, NULL, klass, @@ -955,25 +1078,26 @@ _Jv_JNI_CallStaticMethod (JNIEnv *env, jclass klass, jmethodID id, ...) // Functions with this signature are used to implement functions in // the CallStaticMethod family. template -static T +static T JNICALL _Jv_JNI_CallStaticMethodA (JNIEnv *env, jclass klass, jmethodID id, jvalue *args) { JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC)); - JvAssert (java::lang::Class::class$.isInstance (klass)); + JvAssert (java::lang::Class::class$.isInstance (unwrap (klass))); return _Jv_JNI_CallAnyMethodA (env, NULL, klass, id, args); } -static void -_Jv_JNI_CallStaticVoidMethodV (JNIEnv *env, jclass klass, jmethodID id, - va_list args) +static void JNICALL +_Jv_JNI_CallStaticVoidMethodV (JNIEnv *env, jclass klass, + jmethodID id, va_list args) { _Jv_JNI_CallAnyVoidMethodV (env, NULL, klass, id, args); } -static void -_Jv_JNI_CallStaticVoidMethod (JNIEnv *env, jclass klass, jmethodID id, ...) +static void JNICALL +_Jv_JNI_CallStaticVoidMethod (JNIEnv *env, jclass klass, + jmethodID id, ...) { va_list args; @@ -982,36 +1106,36 @@ _Jv_JNI_CallStaticVoidMethod (JNIEnv *env, jclass klass, jmethodID id, ...) va_end (args); } -static void -_Jv_JNI_CallStaticVoidMethodA (JNIEnv *env, jclass klass, jmethodID id, - jvalue *args) +static void JNICALL +_Jv_JNI_CallStaticVoidMethodA (JNIEnv *env, jclass klass, + jmethodID id, jvalue *args) { _Jv_JNI_CallAnyVoidMethodA (env, NULL, klass, id, args); } -static jobject +static jobject JNICALL _Jv_JNI_NewObjectV (JNIEnv *env, jclass klass, jmethodID id, va_list args) { JvAssert (klass && ! klass->isArray ()); - JvAssert (! strcmp (id->name->data, "") - && id->signature->length > 2 - && id->signature->data[0] == '(' - && ! strcmp (&id->signature->data[id->signature->length - 2], + JvAssert (! strcmp (id->name->chars(), "") + && id->signature->len() > 2 + && id->signature->chars()[0] == '(' + && ! strcmp (&id->signature->chars()[id->signature->len() - 2], ")V")); return _Jv_JNI_CallAnyMethodV (env, NULL, klass, id, args); } -static jobject +static jobject JNICALL _Jv_JNI_NewObject (JNIEnv *env, jclass klass, jmethodID id, ...) { JvAssert (klass && ! klass->isArray ()); - JvAssert (! strcmp (id->name->data, "") - && id->signature->length > 2 - && id->signature->data[0] == '(' - && ! strcmp (&id->signature->data[id->signature->length - 2], + JvAssert (! strcmp (id->name->chars(), "") + && id->signature->len() > 2 + && id->signature->chars()[0] == '(' + && ! strcmp (&id->signature->chars()[id->signature->len() - 2], ")V")); va_list args; @@ -1025,15 +1149,15 @@ _Jv_JNI_NewObject (JNIEnv *env, jclass klass, jmethodID id, ...) return result; } -static jobject +static jobject JNICALL _Jv_JNI_NewObjectA (JNIEnv *env, jclass klass, jmethodID id, jvalue *args) { JvAssert (klass && ! klass->isArray ()); - JvAssert (! strcmp (id->name->data, "") - && id->signature->length > 2 - && id->signature->data[0] == '(' - && ! strcmp (&id->signature->data[id->signature->length - 2], + JvAssert (! strcmp (id->name->chars(), "") + && id->signature->len() > 2 + && id->signature->chars()[0] == '(' + && ! strcmp (&id->signature->chars()[id->signature->len() - 2], ")V")); return _Jv_JNI_CallAnyMethodA (env, NULL, klass, @@ -1043,30 +1167,36 @@ _Jv_JNI_NewObjectA (JNIEnv *env, jclass klass, jmethodID id, template -static T -_Jv_JNI_GetField (JNIEnv *env, jobject obj, jfieldID field) +static T JNICALL +_Jv_JNI_GetField (JNIEnv *env, jobject obj, jfieldID field) { + obj = unwrap (obj); JvAssert (obj); T *ptr = (T *) ((char *) obj + field->getOffset ()); return wrap_value (env, *ptr); } template -static void +static void JNICALL _Jv_JNI_SetField (JNIEnv *, jobject obj, jfieldID field, T value) { + obj = unwrap (obj); + value = unwrap (value); + JvAssert (obj); T *ptr = (T *) ((char *) obj + field->getOffset ()); *ptr = value; } template -static jfieldID +static jfieldID JNICALL _Jv_JNI_GetAnyFieldID (JNIEnv *env, jclass clazz, const char *name, const char *sig) { try { + clazz = unwrap (clazz); + _Jv_InitClass (clazz); _Jv_Utf8Const *a_name = _Jv_makeUtf8Const ((char *) name, -1); @@ -1076,11 +1206,11 @@ _Jv_JNI_GetAnyFieldID (JNIEnv *env, jclass clazz, char s[len + 1]; for (int i = 0; i <= len; ++i) s[i] = (sig[i] == '/') ? '.' : sig[i]; - jclass field_class = _Jv_FindClassFromSignature ((char *) s, NULL); - - // FIXME: what if field_class == NULL? + java::lang::ClassLoader *loader = clazz->getClassLoaderInternal (); + jclass field_class = _Jv_FindClassFromSignature ((char *) s, loader); + if (! field_class) + throw new java::lang::ClassNotFoundException(JvNewStringUTF(s)); - java::lang::ClassLoader *loader = clazz->getClassLoader (); while (clazz != NULL) { // We acquire the class lock so that fields aren't resolved @@ -1099,7 +1229,7 @@ _Jv_JNI_GetAnyFieldID (JNIEnv *env, jclass clazz, // The field might be resolved or it might not be. It // is much simpler to always resolve it. - _Jv_ResolveField (field, loader); + _Jv_Linker::resolve_field (field, loader); if (_Jv_equalUtf8Consts (f_name, a_name) && field->getClass() == field_class) return field; @@ -1120,7 +1250,7 @@ _Jv_JNI_GetAnyFieldID (JNIEnv *env, jclass clazz, } template -static T +static T JNICALL _Jv_JNI_GetStaticField (JNIEnv *env, jclass, jfieldID field) { T *ptr = (T *) field->u.addr; @@ -1128,14 +1258,15 @@ _Jv_JNI_GetStaticField (JNIEnv *env, jclass, jfieldID field) } template -static void +static void JNICALL _Jv_JNI_SetStaticField (JNIEnv *, jclass, jfieldID field, T value) { + value = unwrap (value); T *ptr = (T *) field->u.addr; *ptr = value; } -static jstring +static jstring JNICALL _Jv_JNI_NewString (JNIEnv *env, const jchar *unichars, jsize len) { try @@ -1150,15 +1281,16 @@ _Jv_JNI_NewString (JNIEnv *env, const jchar *unichars, jsize len) } } -static jsize +static jsize JNICALL _Jv_JNI_GetStringLength (JNIEnv *, jstring string) { - return string->length(); + return unwrap (string)->length(); } -static const jchar * +static const jchar * JNICALL _Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy) { + string = unwrap (string); jchar *result = _Jv_GetStringChars (string); mark_for_gc (string, global_ref_table); if (isCopy) @@ -1166,13 +1298,13 @@ _Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy) return (const jchar *) result; } -static void +static void JNICALL _Jv_JNI_ReleaseStringChars (JNIEnv *, jstring string, const jchar *) { - unmark_for_gc (string, global_ref_table); + unmark_for_gc (unwrap (string), global_ref_table); } -static jstring +static jstring JNICALL _Jv_JNI_NewStringUTF (JNIEnv *env, const char *bytes) { try @@ -1187,20 +1319,24 @@ _Jv_JNI_NewStringUTF (JNIEnv *env, const char *bytes) } } -static jsize +static jsize JNICALL _Jv_JNI_GetStringUTFLength (JNIEnv *, jstring string) { - return JvGetStringUTFLength (string); + return JvGetStringUTFLength (unwrap (string)); } -static const char * -_Jv_JNI_GetStringUTFChars (JNIEnv *env, jstring string, jboolean *isCopy) +static const char * JNICALL +_Jv_JNI_GetStringUTFChars (JNIEnv *env, jstring string, + jboolean *isCopy) { - jsize len = JvGetStringUTFLength (string); try { + string = unwrap (string); + if (string == NULL) + return NULL; + jsize len = JvGetStringUTFLength (string); char *r = (char *) _Jv_Malloc (len + 1); - JvGetStringUTFRegion (string, 0, len, r); + JvGetStringUTFRegion (string, 0, string->length(), r); r[len] = '\0'; if (isCopy) @@ -1215,16 +1351,17 @@ _Jv_JNI_GetStringUTFChars (JNIEnv *env, jstring string, jboolean *isCopy) } } -static void +static void JNICALL _Jv_JNI_ReleaseStringUTFChars (JNIEnv *, jstring, const char *utf) { _Jv_Free ((void *) utf); } -static void -_Jv_JNI_GetStringRegion (JNIEnv *env, jstring string, jsize start, jsize len, - jchar *buf) +static void JNICALL +_Jv_JNI_GetStringRegion (JNIEnv *env, jstring string, jsize start, + jsize len, jchar *buf) { + string = unwrap (string); jchar *result = _Jv_GetStringChars (string); if (start < 0 || start > string->length () || len < 0 || start + len > string->length ()) @@ -1242,10 +1379,12 @@ _Jv_JNI_GetStringRegion (JNIEnv *env, jstring string, jsize start, jsize len, memcpy (buf, &result[start], len * sizeof (jchar)); } -static void +static void JNICALL _Jv_JNI_GetStringUTFRegion (JNIEnv *env, jstring str, jsize start, jsize len, char *buf) { + str = unwrap (str); + if (start < 0 || start > str->length () || len < 0 || start + len > str->length ()) { @@ -1262,35 +1401,39 @@ _Jv_JNI_GetStringUTFRegion (JNIEnv *env, jstring str, jsize start, _Jv_GetStringUTFRegion (str, start, len, buf); } -static const jchar * +static const jchar * JNICALL _Jv_JNI_GetStringCritical (JNIEnv *, jstring str, jboolean *isCopy) { - jchar *result = _Jv_GetStringChars (str); + jchar *result = _Jv_GetStringChars (unwrap (str)); if (isCopy) *isCopy = false; return result; } -static void +static void JNICALL _Jv_JNI_ReleaseStringCritical (JNIEnv *, jstring, const jchar *) { // Nothing. } -static jsize +static jsize JNICALL _Jv_JNI_GetArrayLength (JNIEnv *, jarray array) { - return array->length; + return unwrap (array)->length; } -static jarray -_Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, jclass elementClass, - jobject init) +static jobjectArray JNICALL +_Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, + jclass elementClass, jobject init) { try { + elementClass = unwrap (elementClass); + init = unwrap (init); + + _Jv_CheckCast (elementClass, init); jarray result = JvNewObjectArray (length, elementClass, init); - return (jarray) wrap_value (env, result); + return (jobjectArray) wrap_value (env, result); } catch (jthrowable t) { @@ -1299,20 +1442,28 @@ _Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, jclass elementClass, } } -static jobject -_Jv_JNI_GetObjectArrayElement (JNIEnv *env, jobjectArray array, jsize index) +static jobject JNICALL +_Jv_JNI_GetObjectArrayElement (JNIEnv *env, jobjectArray array, + jsize index) { - jobject *elts = elements (array); + if ((unsigned) index >= (unsigned) array->length) + _Jv_ThrowBadArrayIndex (index); + jobject *elts = elements (unwrap (array)); return wrap_value (env, elts[index]); } -static void -_Jv_JNI_SetObjectArrayElement (JNIEnv *env, jobjectArray array, jsize index, - jobject value) +static void JNICALL +_Jv_JNI_SetObjectArrayElement (JNIEnv *env, jobjectArray array, + jsize index, jobject value) { try { + array = unwrap (array); + value = unwrap (value); + _Jv_CheckArrayStore (array, value); + if ((unsigned) index >= (unsigned) array->length) + _Jv_ThrowBadArrayIndex (index); jobject *elts = elements (array); elts[index] = value; } @@ -1323,7 +1474,7 @@ _Jv_JNI_SetObjectArrayElement (JNIEnv *env, jobjectArray array, jsize index, } template -static JArray * +static JArray * JNICALL _Jv_JNI_NewPrimitiveArray (JNIEnv *env, jsize length) { try @@ -1337,11 +1488,14 @@ _Jv_JNI_NewPrimitiveArray (JNIEnv *env, jsize length) } } -template -static T * -_Jv_JNI_GetPrimitiveArrayElements (JNIEnv *, JArray *array, +template +static T * JNICALL +_Jv_JNI_GetPrimitiveArrayElements (JNIEnv *env, JArray *array, jboolean *isCopy) { + array = unwrap (array); + if (! _Jv_JNI_check_types (env, array, K)) + return NULL; T *elts = elements (array); if (isCopy) { @@ -1352,23 +1506,29 @@ _Jv_JNI_GetPrimitiveArrayElements (JNIEnv *, JArray *array, return elts; } -template -static void -_Jv_JNI_ReleasePrimitiveArrayElements (JNIEnv *, JArray *array, +template +static void JNICALL +_Jv_JNI_ReleasePrimitiveArrayElements (JNIEnv *env, JArray *array, T *, jint /* mode */) { + array = unwrap (array); + _Jv_JNI_check_types (env, array, K); // Note that we ignore MODE. We can do this because we never copy // the array elements. My reading of the JNI documentation is that // this is an option for the implementor. unmark_for_gc (array, global_ref_table); } -template -static void +template +static void JNICALL _Jv_JNI_GetPrimitiveArrayRegion (JNIEnv *env, JArray *array, jsize start, jsize len, T *buf) { + array = unwrap (array); + if (! _Jv_JNI_check_types (env, array, K)) + return; + // The cast to unsigned lets us save a comparison. if (start < 0 || len < 0 || (unsigned long) (start + len) > (unsigned long) array->length) @@ -1391,11 +1551,15 @@ _Jv_JNI_GetPrimitiveArrayRegion (JNIEnv *env, JArray *array, } } -template -static void -_Jv_JNI_SetPrimitiveArrayRegion (JNIEnv *env, JArray *array, +template +static void JNICALL +_Jv_JNI_SetPrimitiveArrayRegion (JNIEnv *env, JArray *array, jsize start, jsize len, T *buf) { + array = unwrap (array); + if (! _Jv_JNI_check_types (env, array, K)) + return; + // The cast to unsigned lets us save a comparison. if (start < 0 || len < 0 || (unsigned long) (start + len) > (unsigned long) array->length) @@ -1417,10 +1581,11 @@ _Jv_JNI_SetPrimitiveArrayRegion (JNIEnv *env, JArray *array, } } -static void * +static void * JNICALL _Jv_JNI_GetPrimitiveArrayCritical (JNIEnv *, jarray array, jboolean *isCopy) { + array = unwrap (array); // FIXME: does this work? jclass klass = array->getClass()->getComponentType(); JvAssert (klass->isPrimitive ()); @@ -1430,18 +1595,18 @@ _Jv_JNI_GetPrimitiveArrayCritical (JNIEnv *, jarray array, return r; } -static void +static void JNICALL _Jv_JNI_ReleasePrimitiveArrayCritical (JNIEnv *, jarray, void *, jint) { // Nothing. } -static jint +static jint JNICALL _Jv_JNI_MonitorEnter (JNIEnv *env, jobject obj) { try { - _Jv_MonitorEnter (obj); + _Jv_MonitorEnter (unwrap (obj)); return 0; } catch (jthrowable t) @@ -1451,12 +1616,12 @@ _Jv_JNI_MonitorEnter (JNIEnv *env, jobject obj) return JNI_ERR; } -static jint +static jint JNICALL _Jv_JNI_MonitorExit (JNIEnv *env, jobject obj) { try { - _Jv_MonitorExit (obj); + _Jv_MonitorExit (unwrap (obj)); return 0; } catch (jthrowable t) @@ -1467,12 +1632,13 @@ _Jv_JNI_MonitorExit (JNIEnv *env, jobject obj) } // JDK 1.2 -jobject +jobject JNICALL _Jv_JNI_ToReflectedField (JNIEnv *env, jclass cls, jfieldID fieldID, jboolean) { try { + cls = unwrap (cls); java::lang::reflect::Field *field = new java::lang::reflect::Field(); field->declaringClass = cls; field->offset = (char*) fieldID - (char *) cls->fields; @@ -1487,25 +1653,24 @@ _Jv_JNI_ToReflectedField (JNIEnv *env, jclass cls, jfieldID fieldID, } // JDK 1.2 -static jfieldID +static jfieldID JNICALL _Jv_JNI_FromReflectedField (JNIEnv *, jobject f) { using namespace java::lang::reflect; + f = unwrap (f); Field *field = reinterpret_cast (f); return _Jv_FromReflectedField (field); } -jobject +jobject JNICALL _Jv_JNI_ToReflectedMethod (JNIEnv *env, jclass klass, jmethodID id, jboolean) { using namespace java::lang::reflect; - // FIXME. - static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("", 6); - jobject result = NULL; + klass = unwrap (klass); try { @@ -1533,29 +1698,209 @@ _Jv_JNI_ToReflectedMethod (JNIEnv *env, jclass klass, jmethodID id, return wrap_value (env, result); } -static jmethodID +static jmethodID JNICALL _Jv_JNI_FromReflectedMethod (JNIEnv *, jobject method) { using namespace java::lang::reflect; + method = unwrap (method); if (Method::class$.isInstance (method)) return _Jv_FromReflectedMethod (reinterpret_cast (method)); return _Jv_FromReflectedConstructor (reinterpret_cast (method)); } -static jint -_Jv_JNI_RegisterNatives (JNIEnv *env, jclass k, - const JNINativeMethod *methods, - jint nMethods) +// JDK 1.2. +jweak JNICALL +_Jv_JNI_NewWeakGlobalRef (JNIEnv *env, jobject obj) { -#ifdef INTERPRETER - // For now, this only matters for interpreted methods. FIXME. - if (! _Jv_IsInterpretedClass (k)) + using namespace gnu::gcj::runtime; + JNIWeakRef *ref = NULL; + + try { - // FIXME: throw exception. - return JNI_ERR; + // This seems weird but I think it is correct. + obj = unwrap (obj); + ref = new JNIWeakRef (obj); + mark_for_gc (ref, global_ref_table); + } + catch (jthrowable t) + { + env->ex = t; + } + + return reinterpret_cast (ref); +} + +void JNICALL +_Jv_JNI_DeleteWeakGlobalRef (JNIEnv *, jweak obj) +{ + using namespace gnu::gcj::runtime; + JNIWeakRef *ref = reinterpret_cast (obj); + unmark_for_gc (ref, global_ref_table); + ref->clear (); +} + + + +// Direct byte buffers. + +static jobject JNICALL +_Jv_JNI_NewDirectByteBuffer (JNIEnv *, void *address, jlong length) +{ + using namespace gnu::gcj; + using namespace java::nio; + return new DirectByteBufferImpl$ReadWrite + (reinterpret_cast (address), length); +} + +static void * JNICALL +_Jv_JNI_GetDirectBufferAddress (JNIEnv *, jobject buffer) +{ + using namespace java::nio; + if (! _Jv_IsInstanceOf (buffer, &Buffer::class$)) + return NULL; + Buffer *tmp = static_cast (buffer); + return reinterpret_cast (tmp->address); +} + +static jlong JNICALL +_Jv_JNI_GetDirectBufferCapacity (JNIEnv *, jobject buffer) +{ + using namespace java::nio; + if (! _Jv_IsInstanceOf (buffer, &Buffer::class$)) + return -1; + Buffer *tmp = static_cast (buffer); + if (tmp->address == NULL) + return -1; + return tmp->capacity(); +} + + + +// Hash table of native methods. +static JNINativeMethod *nathash; +// Number of slots used. +static int nathash_count = 0; +// Number of slots available. Must be power of 2. +static int nathash_size = 0; + +#define DELETED_ENTRY ((char *) (~0)) + +// Compute a hash value for a native method descriptor. +static int +hash (const JNINativeMethod *method) +{ + char *ptr; + int hash = 0; + + ptr = method->name; + while (*ptr) + hash = (31 * hash) + *ptr++; + + ptr = method->signature; + while (*ptr) + hash = (31 * hash) + *ptr++; + + return hash; +} + +// Find the slot where a native method goes. +static JNINativeMethod * +nathash_find_slot (const JNINativeMethod *method) +{ + jint h = hash (method); + int step = (h ^ (h >> 16)) | 1; + int w = h & (nathash_size - 1); + int del = -1; + + for (;;) + { + JNINativeMethod *slotp = &nathash[w]; + if (slotp->name == NULL) + { + if (del >= 0) + return &nathash[del]; + else + return slotp; + } + else if (slotp->name == DELETED_ENTRY) + del = w; + else if (! strcmp (slotp->name, method->name) + && ! strcmp (slotp->signature, method->signature)) + return slotp; + w = (w + step) & (nathash_size - 1); + } +} + +// Find a method. Return NULL if it isn't in the hash table. +static void * +nathash_find (JNINativeMethod *method) +{ + if (nathash == NULL) + return NULL; + JNINativeMethod *slot = nathash_find_slot (method); + if (slot->name == NULL || slot->name == DELETED_ENTRY) + return NULL; + return slot->fnPtr; +} + +static void +natrehash () +{ + if (nathash == NULL) + { + nathash_size = 1024; + nathash = + (JNINativeMethod *) _Jv_AllocBytes (nathash_size + * sizeof (JNINativeMethod)); + } + else + { + int savesize = nathash_size; + JNINativeMethod *savehash = nathash; + nathash_size *= 2; + nathash = + (JNINativeMethod *) _Jv_AllocBytes (nathash_size + * sizeof (JNINativeMethod)); + + for (int i = 0; i < savesize; ++i) + { + if (savehash[i].name != NULL && savehash[i].name != DELETED_ENTRY) + { + JNINativeMethod *slot = nathash_find_slot (&savehash[i]); + *slot = savehash[i]; + } + } } - _Jv_InterpClass *klass = reinterpret_cast<_Jv_InterpClass *> (k); +} + +static void +nathash_add (const JNINativeMethod *method) +{ + if (3 * nathash_count >= 2 * nathash_size) + natrehash (); + JNINativeMethod *slot = nathash_find_slot (method); + // If the slot has a real entry in it, then there is no work to do. + if (slot->name != NULL && slot->name != DELETED_ENTRY) + return; + // FIXME + slot->name = strdup (method->name); + // This was already strduped in _Jv_JNI_RegisterNatives. + slot->signature = method->signature; + slot->fnPtr = method->fnPtr; +} + +static jint JNICALL +_Jv_JNI_RegisterNatives (JNIEnv *env, jclass klass, + const JNINativeMethod *methods, + jint nMethods) +{ + // Synchronize while we do the work. This must match + // synchronization in some other functions that manipulate or use + // the nathash table. + JvSynchronize sync (global_ref_table); + + JNINativeMethod dottedMethod; // Look at each descriptor given us, and find the corresponding // method in the class. @@ -1563,23 +1908,34 @@ _Jv_JNI_RegisterNatives (JNIEnv *env, jclass k, { bool found = false; - _Jv_MethodBase **imeths = _Jv_GetFirstMethod (klass); + _Jv_Method *imeths = JvGetFirstMethod (klass); for (int i = 0; i < JvNumMethods (klass); ++i) { - _Jv_MethodBase *meth = imeths[i]; - _Jv_Method *self = meth->get_method (); + _Jv_Method *self = &imeths[i]; + + // Copy this JNINativeMethod and do a slash to dot + // conversion on the signature. + dottedMethod.name = methods[j].name; + dottedMethod.signature = strdup (methods[j].signature); + dottedMethod.fnPtr = methods[j].fnPtr; + char *c = dottedMethod.signature; + while (*c) + { + if (*c == '/') + *c = '.'; + c++; + } - if (! strcmp (self->name->data, methods[j].name) - && ! strcmp (self->signature->data, methods[j].signature)) + if (! strcmp (self->name->chars (), dottedMethod.name) + && ! strcmp (self->signature->chars (), dottedMethod.signature)) { - if (! (self->accflags - & java::lang::reflect::Modifier::NATIVE)) + if (! (self->accflags & java::lang::reflect::Modifier::NATIVE)) break; // Found a match that is native. - _Jv_JNIMethod *jmeth = reinterpret_cast<_Jv_JNIMethod *> (meth); - jmeth->set_function (methods[i].fnPtr); found = true; + nathash_add (&dottedMethod); + break; } } @@ -1589,7 +1945,7 @@ _Jv_JNI_RegisterNatives (JNIEnv *env, jclass k, jstring m = JvNewStringUTF (methods[j].name); try { - env->ex =new java::lang::NoSuchMethodError (m); + env->ex = new java::lang::NoSuchMethodError (m); } catch (jthrowable t) { @@ -1600,14 +1956,12 @@ _Jv_JNI_RegisterNatives (JNIEnv *env, jclass k, } return JNI_OK; -#else /* INTERPRETER */ - return JNI_ERR; -#endif /* INTERPRETER */ } -static jint +static jint JNICALL _Jv_JNI_UnregisterNatives (JNIEnv *, jclass) { + // FIXME -- we could implement this. return JNI_ERR; } @@ -1676,8 +2030,8 @@ mangled_name (jclass klass, _Jv_Utf8Const *func_name, // Don't use add_char because we need a literal `_'. buf[here++] = '_'; - const unsigned char *fn = (const unsigned char *) func_name->data; - const unsigned char *limit = fn + func_name->length; + const unsigned char *fn = (const unsigned char *) func_name->chars (); + const unsigned char *limit = fn + func_name->len (); for (int i = 0; ; ++i) { int ch = UTF8_GET (fn, limit); @@ -1691,8 +2045,8 @@ mangled_name (jclass klass, _Jv_Utf8Const *func_name, buf[here++] = '_'; buf[here++] = '_'; - const unsigned char *sig = (const unsigned char *) signature->data; - limit = sig + signature->length; + const unsigned char *sig = (const unsigned char *) signature->chars (); + limit = sig + signature->len (); JvAssert (sig[0] == '('); ++sig; while (1) @@ -1713,56 +2067,171 @@ extern "C" JNIEnv * _Jv_GetJNIEnvNewFrame (jclass klass) { JNIEnv *env = _Jv_GetCurrentJNIEnv (); - if (env == NULL) + if (__builtin_expect (env == NULL, false)) { env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv)); env->p = &_Jv_JNIFunctions; - env->ex = NULL; env->klass = klass; env->locals = NULL; + // We set env->ex below. + + // Set up the bottom, reusable frame. + env->bottom_locals = (_Jv_JNI_LocalFrame *) + _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame) + + (FRAME_SIZE + * sizeof (jobject))); + + env->bottom_locals->marker = MARK_SYSTEM; + env->bottom_locals->size = FRAME_SIZE; + env->bottom_locals->next = NULL; + env->bottom_locals->allocated_p = 0; + memset (&env->bottom_locals->vec[0], 0, + env->bottom_locals->size * sizeof (jobject)); _Jv_SetCurrentJNIEnv (env); } - _Jv_JNI_LocalFrame *frame - = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame) - + (FRAME_SIZE - * sizeof (jobject))); + // If we're in a simple JNI call (non-nested), we can just reuse the + // locals frame we allocated many calls ago, back when the env was first + // built, above. - frame->marker = MARK_SYSTEM; - frame->size = FRAME_SIZE; - frame->next = env->locals; - env->locals = frame; + if (__builtin_expect (env->locals == NULL, true)) + env->locals = env->bottom_locals; + + else + { + // Alternatively, we might be re-entering JNI, in which case we can't + // reuse the bottom_locals frame, because it is already underneath + // us. So we need to make a new one. - for (int i = 0; i < frame->size; ++i) - frame->vec[i] = NULL; + _Jv_JNI_LocalFrame *frame + = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame) + + (FRAME_SIZE + * sizeof (jobject))); + + frame->marker = MARK_SYSTEM; + frame->size = FRAME_SIZE; + frame->allocated_p = 0; + frame->next = env->locals; + + memset (&frame->vec[0], 0, + frame->size * sizeof (jobject)); + + env->locals = frame; + } + + env->ex = NULL; return env; } +// Destroy the env's reusable resources. This is called from the thread +// destructor "finalize_native" in natThread.cc +void +_Jv_FreeJNIEnv (_Jv_JNIEnv *env) +{ + if (env == NULL) + return; + + if (env->bottom_locals != NULL) + _Jv_Free (env->bottom_locals); + + _Jv_Free (env); +} + // Return the function which implements a particular JNI method. If // we can't find the function, we throw the appropriate exception. // This is `extern "C"' because the compiler uses it. extern "C" void * _Jv_LookupJNIMethod (jclass klass, _Jv_Utf8Const *name, - _Jv_Utf8Const *signature) + _Jv_Utf8Const *signature, MAYBE_UNUSED int args_size) { - char buf[10 + 6 * (name->length + signature->length)]; + int name_length = name->len(); + int sig_length = signature->len(); + char buf[10 + 6 * (name_length + sig_length) + 12]; int long_start; void *function; - mangled_name (klass, name, signature, buf, &long_start); - char c = buf[long_start]; - buf[long_start] = '\0'; - function = _Jv_FindSymbolInExecutable (buf); + // Synchronize on something convenient. Right now we use the hash. + JvSynchronize sync (global_ref_table); + + // First see if we have an override in the hash table. + strncpy (buf, name->chars (), name_length); + buf[name_length] = '\0'; + strncpy (buf + name_length + 1, signature->chars (), sig_length); + buf[name_length + sig_length + 1] = '\0'; + JNINativeMethod meth; + meth.name = buf; + meth.signature = buf + name_length + 1; + function = nathash_find (&meth); + if (function != NULL) + return function; + + // If there was no override, then look in the symbol table. + buf[0] = '_'; + mangled_name (klass, name, signature, buf + 1, &long_start); + char c = buf[long_start + 1]; + buf[long_start + 1] = '\0'; + + function = _Jv_FindSymbolInExecutable (buf + 1); +#ifdef WIN32 + // On Win32, we use the "stdcall" calling convention (see JNICALL + // in jni.h). + // + // For a function named 'fooBar' that takes 'nn' bytes as arguments, + // by default, MinGW GCC exports it as 'fooBar@nn', MSVC exports it + // as '_fooBar@nn' and Borland C exports it as 'fooBar'. We try to + // take care of all these variations here. + + char asz_buf[12]; /* '@' + '2147483647' (32-bit INT_MAX) + '\0' */ + char long_nm_sv[11]; /* Ditto, except for the '\0'. */ + if (function == NULL) { - buf[long_start] = c; + // We have tried searching for the 'fooBar' form (BCC) - now + // try the others. + + // First, save the part of the long name that will be damaged + // by appending '@nn'. + memcpy (long_nm_sv, (buf + long_start + 1 + 1), sizeof (long_nm_sv)); + + sprintf (asz_buf, "@%d", args_size); + strcat (buf, asz_buf); + + // Search for the '_fooBar@nn' form (MSVC). function = _Jv_FindSymbolInExecutable (buf); + + if (function == NULL) + { + // Search for the 'fooBar@nn' form (MinGW GCC). + function = _Jv_FindSymbolInExecutable (buf + 1); + } + } +#endif /* WIN32 */ + + if (function == NULL) + { + buf[long_start + 1] = c; +#ifdef WIN32 + // Restore the part of the long name that was damaged by + // appending the '@nn'. + memcpy ((buf + long_start + 1 + 1), long_nm_sv, sizeof (long_nm_sv)); +#endif /* WIN32 */ + function = _Jv_FindSymbolInExecutable (buf + 1); if (function == NULL) { - jstring str = JvNewStringUTF (name->data); - throw new java::lang::AbstractMethodError (str); +#ifdef WIN32 + strcat (buf, asz_buf); + function = _Jv_FindSymbolInExecutable (buf); + if (function == NULL) + function = _Jv_FindSymbolInExecutable (buf + 1); + + if (function == NULL) +#endif /* WIN32 */ + { + jstring str = JvNewStringUTF (name->chars ()); + throw new java::lang::UnsatisfiedLinkError (str); + } } } @@ -1787,10 +2256,24 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this) // We cache the value that we find, of course, but if we don't find // a value we don't cache that fact -- we might subsequently load a // library which finds the function in question. - if (_this->function == NULL) - _this->function = _Jv_LookupJNIMethod (_this->defining_class, - _this->self->name, - _this->self->signature); + { + // Synchronize on a convenient object to ensure sanity in case two + // threads reach this point for the same function at the same + // time. + JvSynchronize sync (global_ref_table); + if (_this->function == NULL) + { + int args_size = sizeof (JNIEnv *) + _this->args_raw_size; + + if (_this->self->accflags & java::lang::reflect::Modifier::STATIC) + args_size += sizeof (_this->defining_class); + + _this->function = _Jv_LookupJNIMethod (_this->defining_class, + _this->self->name, + _this->self->signature, + args_size); + } + } JvAssert (_this->args_raw_size % sizeof (ffi_raw) == 0); ffi_raw real_args[2 + _this->args_raw_size / sizeof (ffi_raw)]; @@ -1804,12 +2287,38 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this) if ((_this->self->accflags & java::lang::reflect::Modifier::STATIC)) real_args[offset++].ptr = _this->defining_class; + // In libgcj, the callee synchronizes. + jobject sync = NULL; + if ((_this->self->accflags & java::lang::reflect::Modifier::SYNCHRONIZED)) + { + if ((_this->self->accflags & java::lang::reflect::Modifier::STATIC)) + sync = _this->defining_class; + else + sync = (jobject) args[0].ptr; + _Jv_MonitorEnter (sync); + } + // Copy over passed-in arguments. memcpy (&real_args[offset], args, _this->args_raw_size); // The actual call to the JNI function. +#if FFI_NATIVE_RAW_API ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function, ret, real_args); +#else + ffi_java_raw_call (&_this->jni_cif, (void (*)()) _this->function, + ret, real_args); +#endif + + // We might need to unwrap a JNI weak reference here. + if (_this->jni_cif.rtype == &ffi_type_pointer) + { + _Jv_value *val = (_Jv_value *) ret; + val->object_value = unwrap (val->object_value); + } + + if (sync != NULL) + _Jv_MonitorExit (sync); _Jv_JNI_PopSystemFrame (env); } @@ -1824,7 +2333,8 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this) // An internal helper function. static jint -_Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args) +_Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, + void *args, jboolean is_daemon) { JavaVMAttachArgs *attach = reinterpret_cast (args); java::lang::ThreadGroup *group = NULL; @@ -1832,7 +2342,8 @@ _Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args) if (attach) { // FIXME: do we really want to support 1.1? - if (attach->version != JNI_VERSION_1_2 + if (attach->version != JNI_VERSION_1_4 + && attach->version != JNI_VERSION_1_2 && attach->version != JNI_VERSION_1_1) return JNI_EVERSION; @@ -1841,24 +2352,38 @@ _Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args) } // Attaching an already-attached thread is a no-op. - if (_Jv_GetCurrentJNIEnv () != NULL) - return 0; + JNIEnv *env = _Jv_GetCurrentJNIEnv (); + if (env != NULL) + { + *penv = reinterpret_cast (env); + return 0; + } - JNIEnv *env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv)); + env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv)); if (env == NULL) return JNI_ERR; env->p = &_Jv_JNIFunctions; env->ex = NULL; env->klass = NULL; - env->locals + env->bottom_locals = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame) + (FRAME_SIZE * sizeof (jobject))); + env->locals = env->bottom_locals; if (env->locals == NULL) { _Jv_Free (env); return JNI_ERR; } + + env->locals->allocated_p = 0; + env->locals->marker = MARK_SYSTEM; + env->locals->size = FRAME_SIZE; + env->locals->next = NULL; + + for (int i = 0; i < env->locals->size; ++i) + env->locals->vec[i] = NULL; + *penv = reinterpret_cast (env); // This thread might already be a Java thread -- this function might @@ -1867,7 +2392,10 @@ _Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args) { try { - _Jv_AttachCurrentThread (name, group); + if (is_daemon) + _Jv_AttachCurrentThreadAsDaemon (name, group); + else + _Jv_AttachCurrentThread (name, group); } catch (jthrowable t) { @@ -1880,18 +2408,30 @@ _Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args) } // This is the one actually used by JNI. -static jint +static jint JNICALL _Jv_JNI_AttachCurrentThread (JavaVM *vm, void **penv, void *args) { - return _Jv_JNI_AttachCurrentThread (vm, NULL, penv, args); + return _Jv_JNI_AttachCurrentThread (vm, NULL, penv, args, false); } -static jint +static jint JNICALL +_Jv_JNI_AttachCurrentThreadAsDaemon (JavaVM *vm, void **penv, + void *args) +{ + return _Jv_JNI_AttachCurrentThread (vm, NULL, penv, args, true); +} + +static jint JNICALL _Jv_JNI_DestroyJavaVM (JavaVM *vm) { JvAssert (the_vm && vm == the_vm); - JNIEnv *env; + union + { + JNIEnv *env; + void *env_p; + }; + if (_Jv_ThreadCurrent () != NULL) { jstring main_name; @@ -1905,10 +2445,8 @@ _Jv_JNI_DestroyJavaVM (JavaVM *vm) return JNI_ERR; } - jint r = _Jv_JNI_AttachCurrentThread (vm, - main_name, - reinterpret_cast (&env), - NULL); + jint r = _Jv_JNI_AttachCurrentThread (vm, main_name, &env_p, + NULL, false); if (r < 0) return r; } @@ -1921,14 +2459,14 @@ _Jv_JNI_DestroyJavaVM (JavaVM *vm) return JNI_ERR; } -jint +jint JNICALL _Jv_JNI_DetachCurrentThread (JavaVM *) { jint code = _Jv_DetachCurrentThread (); return code ? JNI_EDETACHED : 0; } -static jint +static jint JNICALL _Jv_JNI_GetEnv (JavaVM *, void **penv, jint version) { if (_Jv_ThreadCurrent () == NULL) @@ -1947,7 +2485,8 @@ _Jv_JNI_GetEnv (JavaVM *, void **penv, jint version) #endif // FIXME: do we really want to support 1.1? - if (version != JNI_VERSION_1_2 && version != JNI_VERSION_1_1) + if (version != JNI_VERSION_1_4 && version != JNI_VERSION_1_2 + && version != JNI_VERSION_1_1) { *penv = NULL; return JNI_EVERSION; @@ -1957,16 +2496,16 @@ _Jv_JNI_GetEnv (JavaVM *, void **penv, jint version) return 0; } -jint +jint JNICALL JNI_GetDefaultJavaVMInitArgs (void *args) { jint version = * (jint *) args; - // Here we only support 1.2. - if (version != JNI_VERSION_1_2) + // Here we only support 1.2 and 1.4. + if (version != JNI_VERSION_1_2 && version != JNI_VERSION_1_4) return JNI_EVERSION; JavaVMInitArgs *ia = reinterpret_cast (args); - ia->version = JNI_VERSION_1_2; + ia->version = JNI_VERSION_1_4; ia->nOptions = 0; ia->options = NULL; ia->ignoreUnrecognized = true; @@ -1974,58 +2513,28 @@ JNI_GetDefaultJavaVMInitArgs (void *args) return 0; } -jint +jint JNICALL JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) { JvAssert (! the_vm); + + jint version = * (jint *) args; + // We only support 1.2 and 1.4. + if (version != JNI_VERSION_1_2 && version != JNI_VERSION_1_4) + return JNI_EVERSION; + + JvVMInitArgs* vm_args = reinterpret_cast (args); + + jint result = _Jv_CreateJavaVM (vm_args); + if (result) + return result; + // FIXME: synchronize JavaVM *nvm = (JavaVM *) _Jv_MallocUnchecked (sizeof (JavaVM)); if (nvm == NULL) return JNI_ERR; nvm->functions = &_Jv_JNI_InvokeFunctions; - // Parse the arguments. - if (args != NULL) - { - jint version = * (jint *) args; - // We only support 1.2. - if (version != JNI_VERSION_1_2) - return JNI_EVERSION; - JavaVMInitArgs *ia = reinterpret_cast (args); - for (int i = 0; i < ia->nOptions; ++i) - { - if (! strcmp (ia->options[i].optionString, "vfprintf") - || ! strcmp (ia->options[i].optionString, "exit") - || ! strcmp (ia->options[i].optionString, "abort")) - { - // We are required to recognize these, but for now we - // don't handle them in any way. FIXME. - continue; - } - else if (! strncmp (ia->options[i].optionString, - "-verbose", sizeof ("-verbose") - 1)) - { - // We don't do anything with this option either. We - // might want to make sure the argument is valid, but we - // don't really care all that much for now. - continue; - } - else if (! strncmp (ia->options[i].optionString, "-D", 2)) - { - // FIXME. - continue; - } - else if (ia->ignoreUnrecognized) - { - if (ia->options[i].optionString[0] == '_' - || ! strncmp (ia->options[i].optionString, "-X", 2)) - continue; - } - - return JNI_ERR; - } - } - jint r =_Jv_JNI_AttachCurrentThread (nvm, penv, NULL); if (r < 0) return r; @@ -2033,12 +2542,10 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) the_vm = nvm; *vm = the_vm; - _Jv_JNI_Init(); - return 0; } -jint +jint JNICALL JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms) { if (buf_len <= 0) @@ -2078,7 +2585,7 @@ _Jv_GetJavaVM () return the_vm; } -static jint +static jint JNICALL _Jv_JNI_GetJavaVM (JNIEnv *, JavaVM **vm) { *vm = _Jv_GetJavaVM (); @@ -2087,7 +2594,6 @@ _Jv_JNI_GetJavaVM (JNIEnv *, JavaVM **vm) -#define NOT_IMPL NULL #define RESERVED NULL struct JNINativeInterface _Jv_JNIFunctions = @@ -2271,7 +2777,7 @@ struct JNINativeInterface _Jv_JNIFunctions = _Jv_JNI_ReleaseStringChars, // ReleaseStringChars _Jv_JNI_NewStringUTF, // NewStringUTF _Jv_JNI_GetStringUTFLength, // GetStringUTFLength - _Jv_JNI_GetStringUTFChars, // GetStringUTFLength + _Jv_JNI_GetStringUTFChars, // GetStringUTFChars _Jv_JNI_ReleaseStringUTFChars, // ReleaseStringUTFChars _Jv_JNI_GetArrayLength, // GetArrayLength _Jv_JNI_NewObjectArray, // NewObjectArray @@ -2286,38 +2792,70 @@ struct JNINativeInterface _Jv_JNIFunctions = _Jv_JNI_NewPrimitiveArray, // NewLongArray _Jv_JNI_NewPrimitiveArray, // NewFloatArray _Jv_JNI_NewPrimitiveArray, // NewDoubleArray - _Jv_JNI_GetPrimitiveArrayElements, // GetBooleanArrayElements - _Jv_JNI_GetPrimitiveArrayElements, // GetByteArrayElements - _Jv_JNI_GetPrimitiveArrayElements, // GetCharArrayElements - _Jv_JNI_GetPrimitiveArrayElements, // GetShortArrayElements - _Jv_JNI_GetPrimitiveArrayElements, // GetIntArrayElements - _Jv_JNI_GetPrimitiveArrayElements, // GetLongArrayElements - _Jv_JNI_GetPrimitiveArrayElements, // GetFloatArrayElements - _Jv_JNI_GetPrimitiveArrayElements, // GetDoubleArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseBooleanArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseByteArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseCharArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseShortArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseIntArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseLongArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseFloatArrayElements - _Jv_JNI_ReleasePrimitiveArrayElements, // ReleaseDoubleArrayElements - _Jv_JNI_GetPrimitiveArrayRegion, // GetBooleanArrayRegion - _Jv_JNI_GetPrimitiveArrayRegion, // GetByteArrayRegion - _Jv_JNI_GetPrimitiveArrayRegion, // GetCharArrayRegion - _Jv_JNI_GetPrimitiveArrayRegion, // GetShortArrayRegion - _Jv_JNI_GetPrimitiveArrayRegion, // GetIntArrayRegion - _Jv_JNI_GetPrimitiveArrayRegion, // GetLongArrayRegion - _Jv_JNI_GetPrimitiveArrayRegion, // GetFloatArrayRegion - _Jv_JNI_GetPrimitiveArrayRegion, // GetDoubleArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetBooleanArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetByteArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetCharArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetShortArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetIntArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetLongArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetFloatArrayRegion - _Jv_JNI_SetPrimitiveArrayRegion, // SetDoubleArrayRegion + _Jv_JNI_GetPrimitiveArrayElements, + // GetBooleanArrayElements + _Jv_JNI_GetPrimitiveArrayElements, + // GetByteArrayElements + _Jv_JNI_GetPrimitiveArrayElements, + // GetCharArrayElements + _Jv_JNI_GetPrimitiveArrayElements, + // GetShortArrayElements + _Jv_JNI_GetPrimitiveArrayElements, + // GetIntArrayElements + _Jv_JNI_GetPrimitiveArrayElements, + // GetLongArrayElements + _Jv_JNI_GetPrimitiveArrayElements, + // GetFloatArrayElements + _Jv_JNI_GetPrimitiveArrayElements, + // GetDoubleArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseBooleanArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseByteArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseCharArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseShortArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseIntArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseLongArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseFloatArrayElements + _Jv_JNI_ReleasePrimitiveArrayElements, + // ReleaseDoubleArrayElements + _Jv_JNI_GetPrimitiveArrayRegion, + // GetBooleanArrayRegion + _Jv_JNI_GetPrimitiveArrayRegion, + // GetByteArrayRegion + _Jv_JNI_GetPrimitiveArrayRegion, + // GetCharArrayRegion + _Jv_JNI_GetPrimitiveArrayRegion, + // GetShortArrayRegion + _Jv_JNI_GetPrimitiveArrayRegion, + // GetIntArrayRegion + _Jv_JNI_GetPrimitiveArrayRegion, + // GetLongArrayRegion + _Jv_JNI_GetPrimitiveArrayRegion, + // GetFloatArrayRegion + _Jv_JNI_GetPrimitiveArrayRegion, + // GetDoubleArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetBooleanArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetByteArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetCharArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetShortArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetIntArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetLongArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetFloatArrayRegion + _Jv_JNI_SetPrimitiveArrayRegion, + // SetDoubleArrayRegion _Jv_JNI_RegisterNatives, // RegisterNatives _Jv_JNI_UnregisterNatives, // UnregisterNatives _Jv_JNI_MonitorEnter, // MonitorEnter @@ -2331,10 +2869,14 @@ struct JNINativeInterface _Jv_JNIFunctions = _Jv_JNI_GetStringCritical, // GetStringCritical _Jv_JNI_ReleaseStringCritical, // ReleaseStringCritical - NOT_IMPL /* newweakglobalref */, - NOT_IMPL /* deleteweakglobalref */, + _Jv_JNI_NewWeakGlobalRef, // NewWeakGlobalRef + _Jv_JNI_DeleteWeakGlobalRef, // DeleteWeakGlobalRef + + _Jv_JNI_ExceptionCheck, // ExceptionCheck - _Jv_JNI_ExceptionCheck + _Jv_JNI_NewDirectByteBuffer, // NewDirectByteBuffer + _Jv_JNI_GetDirectBufferAddress, // GetDirectBufferAddress + _Jv_JNI_GetDirectBufferCapacity // GetDirectBufferCapacity }; struct JNIInvokeInterface _Jv_JNI_InvokeFunctions = @@ -2346,5 +2888,6 @@ struct JNIInvokeInterface _Jv_JNI_InvokeFunctions = _Jv_JNI_DestroyJavaVM, _Jv_JNI_AttachCurrentThread, _Jv_JNI_DetachCurrentThread, - _Jv_JNI_GetEnv + _Jv_JNI_GetEnv, + _Jv_JNI_AttachCurrentThreadAsDaemon };