From ddf0fc6c9f1eb8747c9cf6b69e48f11f779632d2 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Tue, 7 Mar 2000 09:52:56 +0000 Subject: resolve.cc (_Jv_SearchMethodInClass): New function. 2000-03-07 Bryce McKinlay * resolve.cc (_Jv_SearchMethodInClass): New function. (_Jv_ResolvePoolEntry): Search superinterfaces for interface methods. * java/lang/Class.h (_Jv_SearchMethodInClass): New prototype. 2000-03-07 Bryce McKinlay * java/lang/Class.h (union _Jv_IDispatchTable): New declaration. (struct _Jv_ifaces): New declaration. JV_CLASS: New macro definition. (getComponentType): Relocate below isArray() for inlining. (getModifiers): Declare `inline'. (getSuperclass): Ditto. (isArray): Ditto. (isPrimitive): Ditto. (_Jv_IsAssignableFrom): New prototype. (_Jv_LookupInterfaceMethodIdx): New prototype. Predeclare with "C" linkage. (_Jv_InitClass): Move from natClass.cc. Declare `inline'. Check for JV_STATE_DONE before invoking initializeClass(). (_Jv_PrepareConstantTimeTables): New prototype. (_Jv_GetInterfaces): Ditto. (_Jv_GenerateITable): Ditto. (_Jv_GetMethodString): Ditto. (_Jv_AppendPartialITable): Ditto. (_Jv_FindIIndex): Ditto. depth, ancestors, idt: New class fields. * java/lang/natClass.cc (isAssignableFrom): Move functionality to inline function `_Jv_IsAssignableFrom'. Use that function. (isInstance): Declare `inline'. (initializeClass): Get lock on class before checking `state'. Unlock before calling resolveClass0. Call _Jv_PrepareConstantTimeTables with the lock held. (_Jv_LookupInterfaceMethod): Use _Jv_GetMessageString. (_Jv_IsAssignableFrom): New inline function. Test assignability using class->depth and ancestor table. (_Jv_IsInstanceOf): Use _Jv_IsAssignableFrom. (_Jv_CheckCast): Move from prims.cc. Use JV_CLASS and _Jv_IsAssignableFrom. (_Jv_CheckArrayStore): Ditto. (_Jv_LookupInterfaceMethodIdx): New function. INITIAL_IOFFSETS_LEN, INITIAL_IFACES_LEN: New #defines. (_Jv_PrepareConstantTimeTables): New function. (_Jv_IndexOf): Ditto. (_Jv_GetInterfaces): Ditto. (_Jv_GenerateITable): Ditto. (_Jv_GetMethodString): Ditto. (_Jv_AppendPartialITable): Ditto. iindex_mutex, iindex_mutex_initialized: New static fields. (_Jv_FindIIndex): New function. * java/lang/natClassLoader.cc (_Jv_NewClass): Set new jclass fields. * prims.cc (_Jv_CheckCast): Moved to natClass.cc. (_Jv_CheckArrayStore): Ditto. (JvNewCharArray, JvNewBooleanArray, JvNewByteArray, JvNewShortArray, JvNewIntArray, JvNewLongArray, JvNewFloatArray, JvNewDoubleArray): Moved to gcj/array.h. (_Jv_Realloc): New function. * gcj/cni.h: Move _Jv_PrimClass definitions to gcj/array.h. * gcj/array.h: _Jv_PrimClass definitions moved from gcj/cni.h. (JvNewCharArray, JvNewBooleanArray, JvNewByteArray, JvNewShortArray, JvNewIntArray, JvNewLongArray, JvNewFloatArray, JvNewDoubleArray): Implementations moved from prims.cc and declared `inline'. * gcj/javaprims.h (_Jv_Realloc): Prototype. * include/jvm.h (_Jv_LookupInterfaceMethodIdx): Prototype. From-SVN: r32382 --- libjava/gcj/array.h | 70 ++++++++++++++++++++++++++++++++++++++++++------- libjava/gcj/cni.h | 5 ---- libjava/gcj/javaprims.h | 1 + 3 files changed, 61 insertions(+), 15 deletions(-) (limited to 'libjava/gcj') diff --git a/libjava/gcj/array.h b/libjava/gcj/array.h index 29be1cc..8b355e2 100644 --- a/libjava/gcj/array.h +++ b/libjava/gcj/array.h @@ -55,18 +55,68 @@ typedef JArray *jfloatArray; typedef JArray *jdoubleArray; typedef JArray *jstringArray; -extern "C" jbooleanArray JvNewBooleanArray (jint length); -extern "C" jbyteArray JvNewByteArray (jint length); -extern "C" jcharArray JvNewCharArray (jint length); -extern "C" jshortArray JvNewShortArray (jint length); -extern "C" jintArray JvNewIntArray (jint length); -extern "C" jlongArray JvNewLongArray (jint length); -extern "C" jfloatArray JvNewFloatArray (jint length); -extern "C" jdoubleArray JvNewDoubleArray (jint length); +extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass, + _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass, + _Jv_doubleClass, _Jv_voidClass; +#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class) + extern "C" jobjectArray _Jv_NewObjectArray(jsize length, jclass, jobject init); +extern "C" jobject _Jv_NewPrimArray (jclass eltype, jint count); + +extern inline jobjectArray +JvNewObjectArray (jsize length, jclass cls, jobject init) +{ + return _Jv_NewObjectArray (length, cls, init); +} + +extern inline jcharArray +JvNewCharArray (jint length) +{ + return (jcharArray) _Jv_NewPrimArray (JvPrimClass (char), length); +} + +extern inline jbooleanArray +JvNewBooleanArray (jint length) +{ + return (jbooleanArray) _Jv_NewPrimArray (JvPrimClass (boolean), length); +} + +extern inline jbyteArray +JvNewByteArray (jint length) +{ + return (jbyteArray) _Jv_NewPrimArray (JvPrimClass (byte), length); +} + +extern inline jshortArray +JvNewShortArray (jint length) +{ + return (jshortArray) _Jv_NewPrimArray (JvPrimClass (short), length); +} + +extern inline jintArray +JvNewIntArray (jint length) +{ + return (jintArray) _Jv_NewPrimArray (JvPrimClass (int), length); +} + +extern inline jlongArray +JvNewLongArray (jint length) +{ + return (jlongArray) _Jv_NewPrimArray (JvPrimClass (long), length); +} + +extern inline jfloatArray +JvNewFloatArray (jint length) +{ + return (jfloatArray) _Jv_NewPrimArray (JvPrimClass (float), length); +} + +extern inline jdoubleArray +JvNewDoubleArray (jint length) +{ + return (jdoubleArray) _Jv_NewPrimArray (JvPrimClass (double), length); +} -inline jobjectArray JvNewObjectArray (jsize length, jclass cls, jobject init) -{ return _Jv_NewObjectArray (length, cls, init); } extern "C" jstringArray JvConvertArgv(int argc, const char **argv); diff --git a/libjava/gcj/cni.h b/libjava/gcj/cni.h index 1c05100..2cad185 100644 --- a/libjava/gcj/cni.h +++ b/libjava/gcj/cni.h @@ -93,11 +93,6 @@ JvNewStringUTF (const char *bytes) return _Jv_NewStringUTF (bytes); } -extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass, - _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass, - _Jv_doubleClass, _Jv_voidClass; -#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class) - class JvSynchronize { private: diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index b88580e..2f3c463 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -272,6 +272,7 @@ extern "C" jsize _Jv_GetStringUTFRegion (jstring, jsize, jsize, char *); extern "C" void _Jv_Throw (void *) __attribute__ ((__noreturn__)); extern "C" void _Jv_Sjlj_Throw (void *) __attribute__ ((__noreturn__)); extern "C" void* _Jv_Malloc (jsize) __attribute__((__malloc__)); +extern "C" void* _Jv_Realloc (void *, jsize); extern "C" void _Jv_Free (void*); typedef unsigned short _Jv_ushort __attribute__((__mode__(__HI__))); -- cgit v1.1