diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Class.h | 10 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 65 |
2 files changed, 70 insertions, 5 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index cdfdd7d..01761af 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -131,6 +131,12 @@ struct _Jv_AddressTable void *addresses[]; }; +struct _Jv_CatchClass +{ + java::lang::Class **address; + _Jv_Utf8Const *classname; +}; + #define JV_PRIMITIVE_VTABLE ((_Jv_VTable *) -1) #define JV_CLASS(Obj) ((jclass) (*(_Jv_VTable **) Obj)->clas) @@ -336,6 +342,7 @@ private: friend void _Jv_LayoutVTableMethods (jclass klass); friend void _Jv_SetVTableEntries (jclass, _Jv_VTable *, jboolean *); friend void _Jv_MakeVTable (jclass); + friend void _Jv_linkExceptionClassTable (jclass); friend jboolean _Jv_CheckAccess (jclass self_klass, jclass other_klass, jint flags); @@ -365,6 +372,8 @@ private: friend void _Jv_PrepareClass (jclass); friend void _Jv_PrepareMissingMethods (jclass base, jclass iface_class); + friend void _Jv_Defer_Resolution (void *cl, _Jv_Method *meth, void **); + friend class _Jv_ClassReader; friend class _Jv_InterpClass; friend class _Jv_InterpMethod; @@ -414,6 +423,7 @@ private: _Jv_MethodSymbol *otable_syms; _Jv_AddressTable *atable; _Jv_MethodSymbol *atable_syms; + _Jv_CatchClass *catch_classes; // Interfaces implemented by this class. jclass *interfaces; // The class loader for this class. diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index c9b7014..2d80ce2 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -12,6 +12,7 @@ details. */ #include <limits.h> #include <string.h> +#include <stddef.h> #pragma implementation "Class.h" @@ -56,7 +57,7 @@ details. */ #include <gnu/gcj/RawData.h> #include <java-cpool.h> - +#include <java-interp.h> using namespace gcj; @@ -796,6 +797,8 @@ java::lang::Class::initializeClass (void) if (otable || atable) _Jv_LinkSymbolTable(this); + _Jv_linkExceptionClassTable (this); + // Steps 8, 9, 10, 11. try { @@ -1541,14 +1544,18 @@ _Jv_LinkSymbolTable(jclass klass) for (index = 0; sym = klass->otable_syms[index], sym.name != NULL; index++) { + // FIXME: Why are we passing NULL as the class loader? jclass target_class = _Jv_FindClass (sym.class_name, NULL); _Jv_Method *meth = NULL; const _Jv_Utf8Const *signature = sym.signature; - // FIXME: This should be special index for ThrowNoSuchMethod(). - klass->otable->offsets[index] = -1; - + { + static char *bounce = (char *)_Jv_ThrowNoSuchMethodError; + ptrdiff_t offset = (char *)(klass->vtable) - bounce; + klass->otable->offsets[index] = offset; + } + if (target_class == NULL) continue; @@ -1658,6 +1665,7 @@ _Jv_LinkSymbolTable(jclass klass) for (index = 0; sym = klass->atable_syms[index], sym.name != NULL; index++) { + // FIXME: Why are we passing NULL as the class loader? jclass target_class = _Jv_FindClass (sym.class_name, NULL); _Jv_Method *meth = NULL; const _Jv_Utf8Const *signature = sym.signature; @@ -1687,7 +1695,13 @@ _Jv_LinkSymbolTable(jclass klass) sym.signature); if (meth != NULL) - klass->atable->addresses[index] = meth->ncode; + { + if (meth->ncode) // Maybe abstract? + klass->atable->addresses[index] = meth->ncode; + else if (_Jv_IsInterpretedClass (target_class)) + _Jv_Defer_Resolution (target_class, meth, + &klass->atable->addresses[index]); + } else klass->atable->addresses[index] = (void *)_Jv_ThrowNoSuchMethodError; @@ -1743,6 +1757,27 @@ _Jv_LinkSymbolTable(jclass klass) } } + +// For each catch_record in the list of caught classes, fill in the +// address field. +void +_Jv_linkExceptionClassTable (jclass self) +{ + struct _Jv_CatchClass *catch_record = self->catch_classes; + if (!catch_record || catch_record->classname) + return; + catch_record++; + while (catch_record->classname) + { + jclass target_class = _Jv_FindClass (catch_record->classname, + self->getClassLoaderInternal ()); + *catch_record->address = target_class; + catch_record++; + } + self->catch_classes->classname = (_Jv_Utf8Const *)-1; +} + + // Returns true if METH should get an entry in a VTable. static jboolean isVirtualMethod (_Jv_Method *meth) @@ -1772,6 +1807,26 @@ _Jv_LayoutVTableMethods (jclass klass) jclass superclass = klass->superclass; + typedef unsigned int uaddr __attribute__ ((mode (pointer))); + + // If superclass looks like a constant pool entry, + // resolve it now. + if ((uaddr)superclass < (uaddr)klass->constants.size) + { + if (klass->state < JV_STATE_LINKED) + { + _Jv_Utf8Const *name = klass->constants.data[(int)superclass].utf8; + superclass = _Jv_FindClass (name, klass->loader); + if (! superclass) + { + jstring str = _Jv_NewStringUTF (name->data); + throw new java::lang::NoClassDefFoundError (str); + } + } + else + superclass = klass->constants.data[(int)superclass].clazz; + } + if (superclass != NULL && superclass->vtable_method_count == -1) { JvSynchronize sync (superclass); |