X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Flinker.c;h=a57849d8f78443dc8eaa36356798397fa6d8d013;hb=4f7f3896b97b7c228687fc2f4f04fcca7cf8f67f;hp=1eb439affdffd7d7d5d62a8a9be51cdff4fa1e19;hpb=eb9e9785855ea7f6ecc490600b8996aaaaac231b;p=cacao.git diff --git a/src/vm/linker.c b/src/vm/linker.c index 1eb439aff..a57849d8f 100644 --- a/src/vm/linker.c +++ b/src/vm/linker.c @@ -1,9 +1,9 @@ /* src/vm/linker.c - class linker functions - Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, - R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, - C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, - Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel, + C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, + E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, + J. Wenninger, Institut f. Computersprachen - TU Wien This file is part of CACAO. @@ -19,10 +19,10 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. - Contact: cacao@complang.tuwien.ac.at + Contact: cacao@cacaojvm.org Authors: Reinhard Grafl @@ -32,16 +32,26 @@ Edwin Steiner Christian Thalinger - $Id: linker.c 2868 2005-06-28 18:53:28Z twisti $ + $Id: linker.c 5868 2006-10-30 11:21:36Z edwin $ */ +#include "config.h" + #include +#include "vm/types.h" + #include "mm/memory.h" #include "native/native.h" -#include "vm/builtin.h" + +#if defined(ENABLE_THREADS) +# include "threads/native/lock.h" +#else +# include "threads/none/lock.h" +#endif + #include "vm/class.h" #include "vm/classcache.h" #include "vm/exceptions.h" @@ -50,7 +60,10 @@ #include "vm/resolve.h" #include "vm/statistics.h" #include "vm/stringlocal.h" -#include "vm/jit/codegen.inc.h" +#include "vm/access.h" +#include "vm/rt-timing.h" +#include "vm/vm.h" +#include "vm/jit/asmpart.h" /* global variables ***********************************************************/ @@ -67,7 +80,7 @@ static s4 classvalue; primitive class. CAUTION: Don't change the order of the types. This table is indexed - by the ARRAYTYPE_ constants (expcept ARRAYTYPE_OBJECT). + by the ARRAYTYPE_ constants (except ARRAYTYPE_OBJECT). *******************************************************************************/ @@ -93,7 +106,7 @@ static classinfo *link_class_intern(classinfo *c); static arraydescriptor *link_array(classinfo *c); static void linker_compute_class_values(classinfo *c); static void linker_compute_subclasses(classinfo *c); -static void linker_addinterface(classinfo *c, classinfo *ic); +static bool linker_addinterface(classinfo *c, classinfo *ic); static s4 class_highestinterface(classinfo *c); @@ -109,6 +122,19 @@ bool linker_init(void) interfaceindex = 0; + /* link java.lang.Class as first class of the system, because we + need it's vftbl for all other classes so we can use a class as + object */ + + if (!link_class(class_java_lang_Class)) + return false; + + /* now set the header.vftbl of all classes which were created + before java.lang.Class was linked */ + + class_postset_header_vftbl(); + + /* link important system classes */ if (!link_class(class_java_lang_Object)) @@ -156,9 +182,6 @@ bool linker_init(void) /* load some other important classes */ - if (!link_class(class_java_lang_Class)) - return false; - if (!link_class(class_java_lang_ClassLoader)) return false; @@ -168,9 +191,18 @@ bool linker_init(void) if (!link_class(class_java_lang_System)) return false; + if (!link_class(class_java_lang_Thread)) + return false; + if (!link_class(class_java_lang_ThreadGroup)) return false; + if (!link_class(class_java_lang_VMSystem)) + return false; + + if (!link_class(class_java_lang_VMThread)) + return false; + /* some classes which may be used more often */ @@ -200,28 +232,28 @@ bool linker_init(void) /* pseudo class for Arraystubs (extends java.lang.Object) */ - pseudo_class_Arraystub = + pseudo_class_Arraystub = class_create_classinfo(utf_new_char("$ARRAYSTUB$")); - pseudo_class_Arraystub->loaded = true; - pseudo_class_Arraystub->super.cls = class_java_lang_Object; - pseudo_class_Arraystub->interfacescount = 2; - pseudo_class_Arraystub->interfaces = MNEW(classref_or_classinfo, 2); - pseudo_class_Arraystub->interfaces[0].cls = class_java_lang_Cloneable; - pseudo_class_Arraystub->interfaces[1].cls = class_java_io_Serializable; + pseudo_class_Arraystub->state |= CLASS_LOADED; + pseudo_class_Arraystub->super.cls = class_java_lang_Object; + pseudo_class_Arraystub->interfacescount = 2; + pseudo_class_Arraystub->interfaces = MNEW(classref_or_classinfo, 2); + pseudo_class_Arraystub->interfaces[0].cls = class_java_lang_Cloneable; + pseudo_class_Arraystub->interfaces[1].cls = class_java_io_Serializable; if (!classcache_store_unique(pseudo_class_Arraystub)) { log_text("could not cache pseudo_class_Arraystub"); assert(0); } - if (!link_class(pseudo_class_Arraystub)) + if (!link_class(pseudo_class_Arraystub)) return false; - /* pseudo class representing the null type */ - + /* pseudo class representing the null type */ + pseudo_class_Null = class_create_classinfo(utf_new_char("$NULL$")); - pseudo_class_Null->loaded = true; - pseudo_class_Null->super.cls = class_java_lang_Object; + pseudo_class_Null->state |= CLASS_LOADED; + pseudo_class_Null->super.cls = class_java_lang_Object; if (!classcache_store_unique(pseudo_class_Null)) { log_text("could not cache pseudo_class_Null"); @@ -231,11 +263,11 @@ bool linker_init(void) if (!link_class(pseudo_class_Null)) return false; - /* pseudo class representing new uninitialized objects */ + /* pseudo class representing new uninitialized objects */ pseudo_class_New = class_create_classinfo(utf_new_char("$NEW$")); - pseudo_class_New->loaded = true; - pseudo_class_New->linked = true; /* XXX is this allright? */ + pseudo_class_New->state |= CLASS_LOADED; + pseudo_class_New->state |= CLASS_LINKED; /* XXX is this allright? */ pseudo_class_New->super.cls = class_java_lang_Object; if (!classcache_store_unique(pseudo_class_New)) { @@ -279,16 +311,15 @@ static bool link_primitivetype_table(void) /* create primitive class */ c = class_create_classinfo(utf_new_char(primitivetype_table[i].name)); - c->classUsed = NOTUSED; /* not used initially CO-RT */ - c->impldBy = NULL; + + c->flags = ACC_PUBLIC | ACC_FINAL | ACC_ABSTRACT; /* prevent loader from loading primitive class */ - c->loaded = true; - if (!classcache_store_unique(c)) { - log_text("Could not cache primitive class"); - return false; - } + c->state |= CLASS_LOADED; + + /* INFO: don't put primitive classes into the classcache */ + if (!link_class(c)) return false; @@ -302,8 +333,6 @@ static bool link_primitivetype_table(void) return false; primitivetype_table[i].class_wrap = c; - primitivetype_table[i].class_wrap->classUsed = NOTUSED; /* not used initially CO-RT */ - primitivetype_table[i].class_wrap->impldBy = NULL; /* create the primitive array class */ @@ -316,8 +345,9 @@ static bool link_primitivetype_table(void) primitivetype_table[i].arrayclass = c; - assert(c->loaded); - if (!c->linked) + assert(c->state & CLASS_LOADED); + + if (!(c->state & CLASS_LINKED)) if (!link_class(c)) return false; @@ -339,34 +369,34 @@ static bool link_primitivetype_table(void) classinfo *link_class(classinfo *c) { classinfo *r; +#if defined(ENABLE_RT_TIMING) + struct timespec time_start, time_end; +#endif + + RT_TIMING_GET_TIME(time_start); - if (!c) { - *exceptionptr = new_nullpointerexception(); + if (c == NULL) { + exceptions_throw_nullpointerexception(); return NULL; } -#if defined(USE_THREADS) - /* enter a monitor on the class */ - - builtin_monitorenter((java_objectheader *) c); -#endif + LOCK_MONITOR_ENTER(c); /* maybe the class is already linked */ - if (c->linked) { -#if defined(USE_THREADS) - builtin_monitorexit((java_objectheader *) c); -#endif + + if (c->state & CLASS_LINKED) { + LOCK_MONITOR_EXIT(c); return c; } -#if defined(STATISTICS) +#if defined(ENABLE_STATISTICS) /* measure time */ - if (getcompilingtime) + if (opt_getcompilingtime) compilingtime_stop(); - if (getloadingtime) + if (opt_getloadingtime) loadingtime_start(); #endif @@ -377,23 +407,23 @@ classinfo *link_class(classinfo *c) /* if return value is NULL, we had a problem and the class is not linked */ if (!r) - c->linked = false; + c->state &= ~CLASS_LINKING; -#if defined(STATISTICS) +#if defined(ENABLE_STATISTICS) /* measure time */ - if (getloadingtime) + if (opt_getloadingtime) loadingtime_stop(); - if (getcompilingtime) + if (opt_getcompilingtime) compilingtime_start(); #endif -#if defined(USE_THREADS) - /* leave the monitor */ + LOCK_MONITOR_EXIT(c); - builtin_monitorexit((java_objectheader *) c); -#endif + RT_TIMING_GET_TIME(time_end); + + RT_TIMING_TIME_DIFF(time_start,time_end,RT_TIMING_LINK_TOTAL); return r; } @@ -415,26 +445,45 @@ static classinfo *link_class_intern(classinfo *c) s4 vftbllength; /* vftbllength of current class */ s4 interfacetablelength; /* interface table length */ vftbl_t *v; /* vftbl of current class */ - s4 i,j; /* interface/method/field counter */ + s4 i; /* interface/method/field counter */ arraydescriptor *arraydesc; /* descriptor for array classes */ +#if defined(ENABLE_RT_TIMING) + struct timespec time_start, time_resolving, time_compute_vftbl, + time_abstract, time_compute_iftbl, time_fill_vftbl, + time_offsets, time_fill_iftbl, time_finalizer, + time_subclasses; +#endif - /* maybe the class is already linked */ + RT_TIMING_GET_TIME(time_start); + + /* the class is already linked */ - if (c->linked) + if (c->state & CLASS_LINKED) return c; +#if !defined(NDEBUG) if (linkverbose) log_message_class("Linking class: ", c); +#endif /* the class must be loaded */ - if (!c->loaded) - throw_cacao_exception_exit(string_java_lang_InternalError, - "Trying to link unloaded class"); + /* XXX should this be a specific exception? */ + assert(c->state & CLASS_LOADED); + + /* cache the self-reference of this class */ + /* we do this for cases where the defining loader of the class */ + /* has not yet been recorded as an initiating loader for the class */ + /* this is needed so subsequent code can assume that self-refs */ + /* will always resolve lazily */ + /* No need to do it for the bootloader - it is always registered */ + /* as initiating loader for the classes it loads. */ + if (c->classloader) + classcache_store(c->classloader,c,false); - /* ok, this class is somewhat linked */ + /* this class is currently linking */ - c->linked = true; + c->state |= CLASS_LINKING; arraydesc = NULL; @@ -458,7 +507,7 @@ static classinfo *link_class_intern(classinfo *c) return NULL; } - assert(tc->loaded); + assert(tc->state & CLASS_LOADED); if (!(tc->flags & ACC_INTERFACE)) { *exceptionptr = @@ -467,7 +516,7 @@ static classinfo *link_class_intern(classinfo *c) return NULL; } - if (!tc->linked) + if (!(tc->state & CLASS_LINKED)) if (!link_class(tc)) return NULL; } @@ -478,8 +527,6 @@ static classinfo *link_class_intern(classinfo *c) if (c->super.any == NULL) { /* class java.lang.Object */ c->index = 0; - c->classUsed = USED; /* Object class is always used CO-RT*/ - c->impldBy = NULL; c->instancesize = sizeof(java_objectheader); vftbllength = supervftbllength = 0; @@ -503,7 +550,7 @@ static classinfo *link_class_intern(classinfo *c) return NULL; } - assert(super->loaded); + assert(super->state & CLASS_LOADED); if (super->flags & ACC_INTERFACE) { /* java.lang.IncompatibleClassChangeError: class a has interface java.lang.Cloneable as super class */ @@ -519,11 +566,17 @@ static classinfo *link_class_intern(classinfo *c) "Cannot inherit from final class"); return NULL; } + + /* link the superclass if necessary */ - if (!super->linked) + if (!(super->state & CLASS_LINKED)) if (!link_class(super)) return NULL; + /* OR the ACC_CLASS_HAS_POINTERS flag */ + + c->flags |= (super->flags & ACC_CLASS_HAS_POINTERS); + /* handle array classes */ if (c->name->text[0] == '[') @@ -536,11 +589,12 @@ static classinfo *link_class_intern(classinfo *c) c->index = super->index + 1; c->instancesize = super->instancesize; - + vftbllength = supervftbllength = super->vftbl->vftbllength; c->finalizer = super->finalizer; } + RT_TIMING_GET_TIME(time_resolving); /* compute vftbl length */ @@ -559,6 +613,15 @@ static classinfo *link_class_intern(classinfo *c) if (tc->methods[j].flags & ACC_PRIVATE) goto notfoundvftblindex; + /* package-private methods in other packages */ + /* must not be overridden */ + /* (see Java Language Specification 8.4.8.1) */ + if ( !(tc->methods[j].flags & (ACC_PUBLIC | ACC_PROTECTED)) + && !SAME_PACKAGE(c,tc) ) + { + goto notfoundvftblindex; + } + if (tc->methods[j].flags & ACC_FINAL) { /* class a overrides final method . */ *exceptionptr = @@ -566,6 +629,21 @@ static classinfo *link_class_intern(classinfo *c) return NULL; } + /* method m overwrites method j of class tc */ + +#if defined(ENABLE_VERIFIER) + /* Add loading constraints (for the more general */ + /* types of method tc->methods[j]). -- */ + /* Not for , as it is not invoked virtually. */ + if ((m->name != utf_init) + && !classcache_add_constraints_for_params( + c->classloader, tc->classloader, + &(tc->methods[j]))) + { + return NULL; + } +#endif + m->vftblindex = tc->methods[j].vftblindex; goto foundvftblindex; } @@ -579,10 +657,15 @@ static classinfo *link_class_intern(classinfo *c) foundvftblindex: ; } - } + } + RT_TIMING_GET_TIME(time_compute_vftbl); - /* check interfaces of ABSTRACT class for unimplemented methods */ + /* Check all interfaces of an abstract class (maybe be an + interface too) for unimplemented methods. Such methods are + called miranda-methods and are marked with the ACC_MIRANDA + flag. VMClass.getDeclaredMethods does not return such + methods. */ if (c->flags & ACC_ABSTRACT) { classinfo *ic; @@ -593,6 +676,8 @@ static classinfo *link_class_intern(classinfo *c) abstractmethodscount = 0; + /* check all interfaces of the abstract class */ + for (i = 0; i < c->interfacescount; i++) { ic = c->interfaces[i].cls; @@ -601,18 +686,14 @@ static classinfo *link_class_intern(classinfo *c) /* skip `' and `' */ - if (im->name == utf_clinit || im->name == utf_init) + if ((im->name == utf_clinit) || (im->name == utf_init)) continue; - tc = c; - - while (tc) { + for (tc = c; tc != NULL; tc = tc->super.cls) { for (k = 0; k < tc->methodscount; k++) { if (method_canoverwrite(im, &(tc->methods[k]))) goto noabstractmethod; } - - tc = tc->super.cls; } abstractmethodscount++; @@ -638,27 +719,27 @@ static classinfo *link_class_intern(classinfo *c) /* skip `' and `' */ - if (im->name == utf_clinit || im->name == utf_init) + if ((im->name == utf_clinit) || (im->name == utf_init)) continue; - tc = c; - - while (tc) { + for (tc = c; tc != NULL; tc = tc->super.cls) { for (k = 0; k < tc->methodscount; k++) { if (method_canoverwrite(im, &(tc->methods[k]))) goto noabstractmethod2; } - - tc = tc->super.cls; } + /* Copy the method found into the new c->methods + array and tag it as miranda-method. */ + am = &(c->methods[c->methodscount]); c->methodscount++; MCOPY(am, im, methodinfo, 1); - am->vftblindex = (vftbllength++); - am->class = c; + am->vftblindex = (vftbllength++); + am->class = c; + am->flags |= ACC_MIRANDA; noabstractmethod2: ; @@ -666,9 +747,10 @@ static classinfo *link_class_intern(classinfo *c) } } } + RT_TIMING_GET_TIME(time_abstract); -#if defined(STATISTICS) +#if defined(ENABLE_STATISTICS) if (opt_stat) count_vftbl_len += sizeof(vftbl_t) + (sizeof(methodptr) * (vftbllength - 1)); @@ -677,15 +759,16 @@ static classinfo *link_class_intern(classinfo *c) /* compute interfacetable length */ interfacetablelength = 0; - tc = c; - while (tc) { + + for (tc = c; tc != NULL; tc = tc->super.cls) { for (i = 0; i < tc->interfacescount; i++) { s4 h = class_highestinterface(tc->interfaces[i].cls) + 1; + if (h > interfacetablelength) interfacetablelength = h; } - tc = tc->super.cls; } + RT_TIMING_GET_TIME(time_compute_iftbl); /* allocate virtual function table */ @@ -694,11 +777,12 @@ static classinfo *link_class_intern(classinfo *c) sizeof(methodptr*) * (interfacetablelength - (interfacetablelength > 0))); v = (vftbl_t *) (((methodptr *) v) + (interfacetablelength - 1) * (interfacetablelength > 1)); - c->header.vftbl = c->vftbl = v; - v->class = c; - v->vftbllength = vftbllength; + + c->vftbl = v; + v->class = c; + v->vftbllength = vftbllength; v->interfacetablelength = interfacetablelength; - v->arraydesc = arraydesc; + v->arraydesc = arraydesc; /* store interface index in vftbl */ @@ -709,36 +793,59 @@ static classinfo *link_class_intern(classinfo *c) for (i = 0; i < supervftbllength; i++) v->table[i] = super->vftbl->table[i]; - + + /* Fill the remaining vftbl slots with the AbstractMethodError + stub (all after the super class slots, because they are already + initialized). */ + + for (; i < vftbllength; i++) { +#if defined(ENABLE_JIT) +# if defined(ENABLE_INTRP) + if (opt_intrp) + v->table[i] = (methodptr) (ptrint) &intrp_asm_abstractmethoderror; + else +# endif + v->table[i] = (methodptr) (ptrint) &asm_abstractmethoderror; +#else + v->table[i] = (methodptr) (ptrint) &intrp_asm_abstractmethoderror; +#endif + } + /* add method stubs into virtual function table */ for (i = 0; i < c->methodscount; i++) { methodinfo *m = &(c->methods[i]); - /* Methods in ABSTRACT classes from interfaces maybe already have a */ - /* stubroutine. */ + assert(m->stubroutine == NULL); - if (!m->stubroutine) { - if (!(m->flags & ACC_NATIVE)) { - m->stubroutine = createcompilerstub(m); + /* Don't create a compiler stub for abstract methods as they + throw an AbstractMethodError with the default stub in the + vftbl. This entry is simply copied by sub-classes. */ - } else { - functionptr f = NULL; + if (m->flags & ACC_ABSTRACT) + continue; -#if defined(ENABLE_STATICVM) - f = native_findfunction(c->name, m->name, m->descriptor, - (m->flags & ACC_STATIC)); - if (!f) - return NULL; +#if defined(ENABLE_JIT) +# if defined(ENABLE_INTRP) + if (opt_intrp) + m->stubroutine = intrp_createcompilerstub(m); + else +#endif + m->stubroutine = createcompilerstub(m); +#else + m->stubroutine = intrp_createcompilerstub(m); #endif - m->stubroutine = codegen_createnativestub(f, m); - } - } + /* static methods are not in the vftbl */ + + if (m->flags & ACC_STATIC) + continue; + + /* insert the stubroutine into the vftbl */ - if (!(m->flags & ACC_STATIC)) - v->table[m->vftblindex] = (methodptr) (ptrint) m->stubroutine; + v->table[m->vftblindex] = (methodptr) (ptrint) m->stubroutine; } + RT_TIMING_GET_TIME(time_fill_vftbl); /* compute instance size and offset of each field */ @@ -747,18 +854,30 @@ static classinfo *link_class_intern(classinfo *c) fieldinfo *f = &(c->fields[i]); if (!(f->flags & ACC_STATIC)) { - dsize = desc_typesize(f->descriptor); - c->instancesize = ALIGN(c->instancesize, dsize); + dsize = descriptor_typesize(f->parseddesc); + + /* On i386 we only align to 4 bytes even for double and s8. */ + /* This matches what gcc does for struct members. We must */ + /* do the same as gcc here because the offsets in native */ + /* header structs like java_lang_Double must match the offsets */ + /* of the Java fields (eg. java.lang.Double.value). */ +#if defined(__I386__) + c->instancesize = MEMORY_ALIGN(c->instancesize, 4); +#else + c->instancesize = MEMORY_ALIGN(c->instancesize, dsize); +#endif + f->offset = c->instancesize; c->instancesize += dsize; } } + RT_TIMING_GET_TIME(time_offsets); /* initialize interfacetable and interfacevftbllength */ - + v->interfacevftbllength = MNEW(s4, interfacetablelength); -#if defined(STATISTICS) +#if defined(ENABLE_STATISTICS) if (opt_stat) count_vftbl_len += (4 + sizeof(s4)) * v->interfacetablelength; #endif @@ -767,12 +886,15 @@ static classinfo *link_class_intern(classinfo *c) v->interfacevftbllength[i] = 0; v->interfacetable[-i] = NULL; } - + /* add interfaces */ - + for (tc = c; tc != NULL; tc = tc->super.cls) for (i = 0; i < tc->interfacescount; i++) - linker_addinterface(c, tc->interfaces[i].cls); + if (!linker_addinterface(c, tc->interfaces[i].cls)) + return NULL; + + RT_TIMING_GET_TIME(time_fill_iftbl); /* add finalizer method (not for java.lang.Object) */ @@ -785,35 +907,32 @@ static classinfo *link_class_intern(classinfo *c) if (!(fi->flags & ACC_STATIC)) c->finalizer = fi; } + RT_TIMING_GET_TIME(time_finalizer); - /* resolve exception class references */ + /* final tasks */ - for (i = 0; i < c->methodscount; i++) { - methodinfo *m = &(c->methods[i]); + linker_compute_subclasses(c); - for (j = 0; j < m->exceptiontablelength; j++) { - if (!m->exceptiontable[j].catchtype.any) - continue; - if (!resolve_classref_or_classinfo(NULL, - m->exceptiontable[j].catchtype, - resolveEager, true, false, - &(m->exceptiontable[j].catchtype.cls))) - return NULL; - } + RT_TIMING_GET_TIME(time_subclasses); - for (j = 0; j < m->thrownexceptionscount; j++) - if (!resolve_classref_or_classinfo(NULL, m->thrownexceptions[j], - resolveEager, true, false, - &(m->thrownexceptions[j].cls))) - return NULL; - } - - /* final tasks */ + /* revert the linking state and class is linked */ - linker_compute_subclasses(c); + c->state = (c->state & ~CLASS_LINKING) | CLASS_LINKED; +#if !defined(NDEBUG) if (linkverbose) log_message_class("Linking done class: ", c); +#endif + + RT_TIMING_TIME_DIFF(time_start ,time_resolving ,RT_TIMING_LINK_RESOLVE); + RT_TIMING_TIME_DIFF(time_resolving ,time_compute_vftbl,RT_TIMING_LINK_C_VFTBL); + RT_TIMING_TIME_DIFF(time_compute_vftbl,time_abstract ,RT_TIMING_LINK_ABSTRACT); + RT_TIMING_TIME_DIFF(time_abstract ,time_compute_iftbl,RT_TIMING_LINK_C_IFTBL); + RT_TIMING_TIME_DIFF(time_compute_iftbl,time_fill_vftbl ,RT_TIMING_LINK_F_VFTBL); + RT_TIMING_TIME_DIFF(time_fill_vftbl ,time_offsets ,RT_TIMING_LINK_OFFSETS); + RT_TIMING_TIME_DIFF(time_offsets ,time_fill_iftbl ,RT_TIMING_LINK_F_IFTBL); + RT_TIMING_TIME_DIFF(time_fill_iftbl ,time_finalizer ,RT_TIMING_LINK_FINALIZER); + RT_TIMING_TIME_DIFF(time_finalizer ,time_subclasses ,RT_TIMING_LINK_SUBCLASS); /* just return c to show that we didn't had a problem */ @@ -847,28 +966,29 @@ static arraydescriptor *link_array(classinfo *c) switch (c->name->text[1]) { case '[': /* c is an array of arrays. */ - u = utf_new_intern(c->name->text + 1, namelen - 1); + u = utf_new(c->name->text + 1, namelen - 1); if (!(comp = load_class_from_classloader(u, c->classloader))) return NULL; break; case 'L': /* c is an array of objects. */ - u = utf_new_intern(c->name->text + 2, namelen - 3); + u = utf_new(c->name->text + 2, namelen - 3); if (!(comp = load_class_from_classloader(u, c->classloader))) return NULL; break; } /* If the component type has not been linked, link it now */ - assert(!comp || comp->loaded); - if (comp && !comp->linked) { + assert(!comp || (comp->state & CLASS_LOADED)); + + if (comp && !(comp->state & CLASS_LINKED)) if (!link_class(comp)) return NULL; - } /* Allocate the arraydescriptor */ + desc = NEW(arraydescriptor); if (comp) { @@ -955,8 +1075,8 @@ static arraydescriptor *link_array(classinfo *c) break; default: - log_text("Invalid array class name"); - assert(0); + *exceptionptr = new_noclassdeffounderror(c->name); + return NULL; } desc->componentvftbl = NULL; @@ -977,12 +1097,8 @@ static arraydescriptor *link_array(classinfo *c) static void linker_compute_subclasses(classinfo *c) { -#if defined(USE_THREADS) -#if defined(NATIVE_THREADS) +#if defined(ENABLE_THREADS) compiler_lock(); -#else - intsDisable(); -#endif #endif if (!(c->flags & ACC_INTERFACE)) { @@ -1001,12 +1117,8 @@ static void linker_compute_subclasses(classinfo *c) linker_compute_class_values(class_java_lang_Object); -#if defined(USE_THREADS) -#if defined(NATIVE_THREADS) +#if defined(ENABLE_THREADS) compiler_unlock(); -#else - intsRestore(); -#endif #endif } @@ -1040,58 +1152,110 @@ static void linker_compute_class_values(classinfo *c) Is needed by link_class for adding a VTBL to a class. All interfaces implemented by ic are added as well. + RETURN VALUE: + true.........everything ok + false........an exception has been thrown + *******************************************************************************/ -static void linker_addinterface(classinfo *c, classinfo *ic) +static bool linker_addinterface(classinfo *c, classinfo *ic) { - s4 j, m; - s4 i = ic->index; - vftbl_t *v = c->vftbl; + s4 j, k; + vftbl_t *v; + s4 i; + classinfo *sc; + methodinfo *m; - if (i >= v->interfacetablelength) { - log_text("Inernal error: interfacetable overflow"); - assert(0); - } + v = c->vftbl; + i = ic->index; + + if (i >= v->interfacetablelength) + vm_abort("Internal error: interfacetable overflow"); + + /* if this interface has already been added, return immediately */ - if (v->interfacetable[-i]) - return; + if (v->interfacetable[-i] != NULL) + return true; if (ic->methodscount == 0) { /* fake entry needed for subtype test */ v->interfacevftbllength[i] = 1; - v->interfacetable[-i] = MNEW(methodptr, 1); - v->interfacetable[-i][0] = NULL; - - } else { + v->interfacetable[-i] = MNEW(methodptr, 1); + v->interfacetable[-i][0] = NULL; + } + else { v->interfacevftbllength[i] = ic->methodscount; - v->interfacetable[-i] = MNEW(methodptr, ic->methodscount); + v->interfacetable[-i] = MNEW(methodptr, ic->methodscount); -#if defined(STATISTICS) +#if defined(ENABLE_STATISTICS) if (opt_stat) count_vftbl_len += sizeof(methodptr) * (ic->methodscount + (ic->methodscount == 0)); #endif for (j = 0; j < ic->methodscount; j++) { - classinfo *sc = c; + for (sc = c; sc != NULL; sc = sc->super.cls) { + for (k = 0; k < sc->methodscount; k++) { + m = &(sc->methods[k]); + + if (method_canoverwrite(m, &(ic->methods[j]))) { + /* method m overwrites the (abstract) method */ +#if defined(ENABLE_VERIFIER) + /* Add loading constraints (for the more + general types of the method + ic->methods[j]). */ + if (!classcache_add_constraints_for_params( + c->classloader, ic->classloader, + &(ic->methods[j]))) + { + return false; + } +#endif + + /* XXX taken from gcj */ + /* check for ACC_STATIC: IncompatibleClassChangeError */ - while (sc) { - for (m = 0; m < sc->methodscount; m++) { - methodinfo *mi = &(sc->methods[m]); + /* check for !ACC_PUBLIC: IllegalAccessError */ - if (method_canoverwrite(mi, &(ic->methods[j]))) { - v->interfacetable[-i][j] = v->table[mi->vftblindex]; + /* check for ACC_ABSTRACT: AbstracMethodError, + not sure about that one */ + + v->interfacetable[-i][j] = v->table[m->vftblindex]; goto foundmethod; } } - sc = sc->super.cls; } + + /* If no method was found, insert the AbstractMethodError + stub. */ + +#if defined(ENABLE_JIT) +# if defined(ENABLE_INTRP) + if (opt_intrp) + v->interfacetable[-i][j] = + (methodptr) (ptrint) &intrp_asm_abstractmethoderror; + else +# endif + v->interfacetable[-i][j] = + (methodptr) (ptrint) &asm_abstractmethoderror; +#else + v->interfacetable[-i][j] = + (methodptr) (ptrint) &intrp_asm_abstractmethoderror; +#endif + foundmethod: ; } } - for (j = 0; j < ic->interfacescount; j++) - linker_addinterface(c, ic->interfaces[j].cls); + /* add superinterfaces of this interface */ + + for (j = 0; j < ic->interfacescount; j++) + if (!linker_addinterface(c, ic->interfaces[j].cls)) + return false; + + /* everything ok */ + + return true; } @@ -1134,4 +1298,5 @@ static s4 class_highestinterface(classinfo *c) * c-basic-offset: 4 * tab-width: 4 * End: + * vim:noexpandtab:sw=4:ts=4: */