X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Floader.c;h=92d8c0fa395bda9fd3d6888de431d3c57d7e7038;hb=4f021ace4cbb48cb8d75e5445929a01f61ca756a;hp=d8c91fb75ce669af4538632947d050679169f111;hpb=7beb1bd2aaeaaed65d9b7eb7ca6fcba6036f0800;p=cacao.git diff --git a/src/vm/loader.c b/src/vm/loader.c index d8c91fb75..92d8c0fa3 100644 --- a/src/vm/loader.c +++ b/src/vm/loader.c @@ -32,7 +32,7 @@ Edwin Steiner Christian Thalinger - $Id: loader.c 3372 2005-10-06 13:10:24Z twisti $ + $Id: loader.c 3684 2005-11-16 13:28:33Z twisti $ */ @@ -1116,7 +1116,7 @@ static bool load_constantpool(classbuffer *cb, descriptor_pool *descpool) return false; } /* insert utf-string into the utf-symboltable */ - cpinfos[idx] = utf_new_intern((char *) (cb->pos + 1), length); + cpinfos[idx] = utf_new((char *) (cb->pos + 1), length); /* skip bytes of the string (buffer size check above) */ skip_nbytes(cb, length); @@ -1311,6 +1311,13 @@ static bool load_field(classbuffer *cb, fieldinfo *f, descriptor_pool *descpool) if (!descriptor_pool_add(descpool, u, NULL)) return false; + /* descriptor_pool_add accepts method descriptors, so we have to check */ + /* against them here before the call of desc_to_type below. */ + if (u->text[0] == '(') { + *exceptionptr = new_classformaterror(c,"Method descriptor used for field"); + return false; + } + if (opt_verify) { /* check name */ if (!is_valid_name_utf(f->name) || f->name->text[0] == '<') { @@ -1685,7 +1692,8 @@ static bool load_method(classbuffer *cb, methodinfo *m, descriptor_pool *descpoo #if defined(STATISTICS) if (opt_stat) { count_vmcode_len += m->jcodelength + 18; - count_extable_len += 8 * m->exceptiontablelength; + count_extable_len += + m->exceptiontablelength * sizeof(exceptiontable); } #endif @@ -2005,7 +2013,7 @@ classinfo *load_class_from_classloader(utf *name, java_objectheader *cl) case 'L': /* check for cases like `[L;' or `[L[I;' or `[Ljava.lang.Object' */ if (namelen < 4 || text[2] == '[' || text[namelen - 1] != ';') { - *exceptionptr = new_classnotfoundexception(name); + *exceptionptr = new_noclassdeffounderror(name); return false; } @@ -2070,6 +2078,14 @@ classinfo *load_class_from_classloader(utf *name, java_objectheader *cl) r = c; } + else { + /* loadClass has thrown an exception */ + /* we must convert ClassNotFoundException into NoClassDefFoundException */ + /* XXX maybe we should have a flag that avoids this conversion */ + /* for calling load_class_from_classloader from Class.forName */ + /* Currently we do a double conversion in these cases */ + classnotfoundexception_to_noclassdeffounderror(); + } /* SUN compatible -verbose:class output */ @@ -2478,7 +2494,7 @@ classinfo *load_class_from_classbuffer(classbuffer *cb) goto return_exception; c->fieldscount = suck_u2(cb); - c->fields = GCNEW(fieldinfo, c->fieldscount); + c->fields = GCNEW_UNCOLLECTABLE(fieldinfo, c->fieldscount); /* c->fields = MNEW(fieldinfo, c->fieldscount); */ for (i = 0; i < c->fieldscount; i++) { if (!load_field(cb, &(c->fields[i]),descpool)) @@ -2813,7 +2829,7 @@ classinfo *load_newly_created_array(classinfo *c, java_objectheader *loader) /* Check array class name */ if (namelen < 2 || text[0] != '[') { - *exceptionptr = new_classnotfoundexception(c->name); + *exceptionptr = new_noclassdeffounderror(c->name); return NULL; } @@ -2823,7 +2839,7 @@ classinfo *load_newly_created_array(classinfo *c, java_objectheader *loader) case '[': /* c is an array of arrays. We have to create the component class. */ - u = utf_new_intern(text + 1, namelen - 1); + u = utf_new(text + 1, namelen - 1); LOADER_INC(); if (!(comp = load_class_from_classloader(u, loader))) { LOADER_DEC(); @@ -2845,11 +2861,11 @@ classinfo *load_newly_created_array(classinfo *c, java_objectheader *loader) /* check for cases like `[L;' or `[L[I;' or `[Ljava.lang.Object' */ if (namelen < 4 || text[2] == '[' || text[namelen - 1] != ';') { - *exceptionptr = new_classnotfoundexception(c->name); + *exceptionptr = new_noclassdeffounderror(c->name); return NULL; } - u = utf_new_intern(text + 2, namelen - 3); + u = utf_new(text + 2, namelen - 3); LOADER_INC(); if (!(comp = load_class_from_classloader(u, loader))) { @@ -2872,7 +2888,7 @@ classinfo *load_newly_created_array(classinfo *c, java_objectheader *loader) /* check for cases like `[II' */ if (namelen > 2) { - *exceptionptr = new_classnotfoundexception(c->name); + *exceptionptr = new_noclassdeffounderror(c->name); return NULL; } @@ -2972,580 +2988,6 @@ classinfo *load_newly_created_array(classinfo *c, java_objectheader *loader) } -/****************** Function: class_resolvefield_int *************************** - - This is an internally used helper function. Do not use this directly. - - Tries to resolve a field having the given name and type. - If the field cannot be resolved, NULL is returned. - -*******************************************************************************/ - -static fieldinfo *class_resolvefield_int(classinfo *c, utf *name, utf *desc) -{ - fieldinfo *fi; - s4 i; - - /* search for field in class c */ - - for (i = 0; i < c->fieldscount; i++) { - if ((c->fields[i].name == name) && (c->fields[i].descriptor == desc)) { - return &(c->fields[i]); - } - } - - /* try superinterfaces recursively */ - - for (i = 0; i < c->interfacescount; i++) { - fi = class_resolvefield_int(c->interfaces[i].cls, name, desc); - if (fi) - return fi; - } - - /* try superclass */ - - if (c->super.cls) - return class_resolvefield_int(c->super.cls, name, desc); - - /* not found */ - - return NULL; -} - - -/********************* Function: class_resolvefield *************************** - - Resolves a reference from REFERER to a field with NAME and DESC in class C. - - If the field cannot be resolved the return value is NULL. If EXCEPT is - true *exceptionptr is set, too. - -*******************************************************************************/ - -fieldinfo *class_resolvefield(classinfo *c, utf *name, utf *desc, - classinfo *referer, bool except) -{ - fieldinfo *fi; - - /* XXX resolve class c */ - /* XXX check access from REFERER to C */ - - fi = class_resolvefield_int(c, name, desc); - - if (!fi) { - if (except) - *exceptionptr = - new_exception_utfmessage(string_java_lang_NoSuchFieldError, - name); - - return NULL; - } - - /* XXX check access rights */ - - return fi; -} - - -/* class_findmethod ************************************************************ - - Searches a 'classinfo' structure for a method having the given name - and descriptor. If descriptor is NULL, it is ignored. - -*******************************************************************************/ - -methodinfo *class_findmethod(classinfo *c, utf *name, utf *desc) -{ - methodinfo *m; - s4 i; - - for (i = 0; i < c->methodscount; i++) { - m = &(c->methods[i]); - - if ((m->name == name) && ((desc == NULL) || (m->descriptor == desc))) - return m; - } - - return NULL; -} - - -/************************* Function: class_findmethod_approx ****************** - - like class_findmethod but ignores the return value when comparing the - descriptor. - -*******************************************************************************/ - -methodinfo *class_findmethod_approx(classinfo *c, utf *name, utf *desc) -{ - s4 i; - - for (i = 0; i < c->methodscount; i++) { - if (c->methods[i].name == name) { - utf *meth_descr = c->methods[i].descriptor; - - if (desc == NULL) - /* ignore type */ - return &(c->methods[i]); - - if (desc->blength <= meth_descr->blength) { - /* current position in utf text */ - char *desc_utf_ptr = desc->text; - char *meth_utf_ptr = meth_descr->text; - /* points behind utf strings */ - char *desc_end = UTF_END(desc); - char *meth_end = UTF_END(meth_descr); - char ch; - - /* compare argument types */ - while (desc_utf_ptr < desc_end && meth_utf_ptr < meth_end) { - - if ((ch = *desc_utf_ptr++) != (*meth_utf_ptr++)) - break; /* no match */ - - if (ch == ')') - return &(c->methods[i]); /* all parameter types equal */ - } - } - } - } - - return NULL; -} - - -/***************** Function: class_resolvemethod_approx *********************** - - Searches a class and every super class for a method (without paying - attention to the return value) - -*******************************************************************************/ - -methodinfo *class_resolvemethod_approx(classinfo *c, utf *name, utf *desc) -{ - while (c) { - /* search for method (ignore returntype) */ - methodinfo *m = class_findmethod_approx(c, name, desc); - /* method found */ - if (m) return m; - /* search superclass */ - c = c->super.cls; - } - - return NULL; -} - - -/* class_resolvemethod ********************************************************* - - Searches a class and it's super classes for a method. - - Superinterfaces are *not* searched. - -*******************************************************************************/ - -methodinfo *class_resolvemethod(classinfo *c, utf *name, utf *desc) -{ - methodinfo *m; - - while (c) { - m = class_findmethod(c, name, desc); - - if (m) - return m; - - c = c->super.cls; - } - - return NULL; -} - - -/* class_resolveinterfacemethod_intern ***************************************** - - Internally used helper function. Do not use this directly. - -*******************************************************************************/ - -static methodinfo *class_resolveinterfacemethod_intern(classinfo *c, - utf *name, utf *desc) -{ - methodinfo *m; - s4 i; - - m = class_findmethod(c, name, desc); - - if (m) - return m; - - /* try the superinterfaces */ - - for (i = 0; i < c->interfacescount; i++) { - m = class_resolveinterfacemethod_intern(c->interfaces[i].cls, - name, desc); - - if (m) - return m; - } - - return NULL; -} - -/* class_resolveinterfacemethod ************************************************ - - Resolves a reference from REFERER to a method with NAME and DESC in - interface C. - - If the method cannot be resolved the return value is NULL. If - EXCEPT is true *exceptionptr is set, too. - -*******************************************************************************/ - -methodinfo *class_resolveinterfacemethod(classinfo *c, utf *name, utf *desc, - classinfo *referer, bool except) -{ - methodinfo *mi; - - /* XXX resolve class c */ - /* XXX check access from REFERER to C */ - - if (!(c->flags & ACC_INTERFACE)) { - if (except) - *exceptionptr = - new_exception(string_java_lang_IncompatibleClassChangeError); - - return NULL; - } - - mi = class_resolveinterfacemethod_intern(c, name, desc); - - if (mi) - return mi; - - /* try class java.lang.Object */ - - mi = class_findmethod(class_java_lang_Object, name, desc); - - if (mi) - return mi; - - if (except) - *exceptionptr = - new_exception_utfmessage(string_java_lang_NoSuchMethodError, name); - - return NULL; -} - - -/* class_resolveclassmethod **************************************************** - - Resolves a reference from REFERER to a method with NAME and DESC in - class C. - - If the method cannot be resolved the return value is NULL. If - EXCEPT is true *exceptionptr is set, too. - -*******************************************************************************/ - -methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *desc, - classinfo *referer, bool except) -{ - classinfo *cls; - methodinfo *mi; - s4 i; - char *msg; - s4 msglen; - - /* XXX resolve class c */ - /* XXX check access from REFERER to C */ - -/* if (c->flags & ACC_INTERFACE) { */ -/* if (except) */ -/* *exceptionptr = */ -/* new_exception(string_java_lang_IncompatibleClassChangeError); */ -/* return NULL; */ -/* } */ - - /* try class c and its superclasses */ - - cls = c; - - while (cls) { - mi = class_findmethod(cls, name, desc); - - if (mi) - goto found; - - cls = cls->super.cls; - } - - /* try the superinterfaces */ - - for (i = 0; i < c->interfacescount; i++) { - mi = class_resolveinterfacemethod_intern(c->interfaces[i].cls, - name, desc); - - if (mi) - goto found; - } - - if (except) { - msglen = utf_strlen(c->name) + strlen(".") + utf_strlen(name) + - utf_strlen(desc) + strlen("0"); - - msg = MNEW(char, msglen); - - utf_sprint(msg, c->name); - strcat(msg, "."); - utf_sprint(msg + strlen(msg), name); - utf_sprint(msg + strlen(msg), desc); - - *exceptionptr = - new_exception_message(string_java_lang_NoSuchMethodError, msg); - - MFREE(msg, char, msglen); - } - - return NULL; - - found: - if ((mi->flags & ACC_ABSTRACT) && !(c->flags & ACC_ABSTRACT)) { - if (except) - *exceptionptr = new_exception(string_java_lang_AbstractMethodError); - - return NULL; - } - - /* XXX check access rights */ - - return mi; -} - - -/************************* Function: class_issubclass ************************** - - Checks if sub is a descendant of super. - -*******************************************************************************/ - -bool class_issubclass(classinfo *sub, classinfo *super) -{ - for (;;) { - if (!sub) return false; - if (sub == super) return true; - sub = sub->super.cls; - } -} - - -void class_showconstanti(classinfo *c, int ii) -{ - u4 i = ii; - voidptr e; - - e = c->cpinfos [i]; - printf ("#%d: ", (int) i); - if (e) { - switch (c->cptags [i]) { - case CONSTANT_Class: - printf("Classreference -> "); - utf_display(((constant_classref*)e)->name); - break; - - case CONSTANT_Fieldref: - printf("Fieldref -> "); goto displayFMIi; - case CONSTANT_Methodref: - printf("Methodref -> "); goto displayFMIi; - case CONSTANT_InterfaceMethodref: - printf("InterfaceMethod -> "); goto displayFMIi; - displayFMIi: - { - constant_FMIref *fmi = e; - utf_display(fmi->classref->name); - printf("."); - utf_display(fmi->name); - printf(" "); - utf_display(fmi->descriptor); - } - break; - - case CONSTANT_String: - printf("String -> "); - utf_display(e); - break; - case CONSTANT_Integer: - printf("Integer -> %d", (int) (((constant_integer*)e)->value)); - break; - case CONSTANT_Float: - printf("Float -> %f", ((constant_float*)e)->value); - break; - case CONSTANT_Double: - printf("Double -> %f", ((constant_double*)e)->value); - break; - case CONSTANT_Long: - { - u8 v = ((constant_long*)e)->value; -#if U8_AVAILABLE - printf("Long -> %ld", (long int) v); -#else - printf("Long -> HI: %ld, LO: %ld\n", - (long int) v.high, (long int) v.low); -#endif - } - break; - case CONSTANT_NameAndType: - { - constant_nameandtype *cnt = e; - printf("NameAndType: "); - utf_display(cnt->name); - printf(" "); - utf_display(cnt->descriptor); - } - break; - case CONSTANT_Utf8: - printf("Utf8 -> "); - utf_display(e); - break; - default: - log_text("Invalid type of ConstantPool-Entry"); - assert(0); - } - } - printf("\n"); -} - - -void class_showconstantpool (classinfo *c) -{ - u4 i; - voidptr e; - - printf ("---- dump of constant pool ----\n"); - - for (i=0; icpcount; i++) { - printf ("#%d: ", (int) i); - - e = c -> cpinfos [i]; - if (e) { - - switch (c -> cptags [i]) { - case CONSTANT_Class: - printf ("Classreference -> "); - utf_display ( ((constant_classref*)e) -> name ); - break; - - case CONSTANT_Fieldref: - printf ("Fieldref -> "); goto displayFMI; - case CONSTANT_Methodref: - printf ("Methodref -> "); goto displayFMI; - case CONSTANT_InterfaceMethodref: - printf ("InterfaceMethod -> "); goto displayFMI; - displayFMI: - { - constant_FMIref *fmi = e; - utf_display ( fmi->classref->name ); - printf ("."); - utf_display ( fmi->name); - printf (" "); - utf_display ( fmi->descriptor ); - } - break; - - case CONSTANT_String: - printf ("String -> "); - utf_display (e); - break; - case CONSTANT_Integer: - printf ("Integer -> %d", (int) ( ((constant_integer*)e) -> value) ); - break; - case CONSTANT_Float: - printf ("Float -> %f", ((constant_float*)e) -> value); - break; - case CONSTANT_Double: - printf ("Double -> %f", ((constant_double*)e) -> value); - break; - case CONSTANT_Long: - { - u8 v = ((constant_long*)e) -> value; -#if U8_AVAILABLE - printf ("Long -> %ld", (long int) v); -#else - printf ("Long -> HI: %ld, LO: %ld\n", - (long int) v.high, (long int) v.low); -#endif - } - break; - case CONSTANT_NameAndType: - { - constant_nameandtype *cnt = e; - printf ("NameAndType: "); - utf_display (cnt->name); - printf (" "); - utf_display (cnt->descriptor); - } - break; - case CONSTANT_Utf8: - printf ("Utf8 -> "); - utf_display (e); - break; - default: - log_text("Invalid type of ConstantPool-Entry"); - assert(0); - } - } - - printf ("\n"); - } -} - - - -/********** Function: class_showmethods (debugging only) *************/ - -void class_showmethods (classinfo *c) -{ - s4 i; - - printf ("--------- Fields and Methods ----------------\n"); - printf ("Flags: "); printflags (c->flags); printf ("\n"); - - printf ("This: "); utf_display (c->name); printf ("\n"); - if (c->super.cls) { - printf ("Super: "); utf_display (c->super.cls->name); printf ("\n"); - } - printf ("Index: %d\n", c->index); - - printf ("interfaces:\n"); - for (i=0; i < c-> interfacescount; i++) { - printf (" "); - utf_display (c -> interfaces[i].cls -> name); - printf (" (%d)\n", c->interfaces[i].cls -> index); - } - - printf ("fields:\n"); - for (i=0; i < c -> fieldscount; i++) { - field_display (&(c -> fields[i])); - } - - printf ("methods:\n"); - for (i=0; i < c -> methodscount; i++) { - methodinfo *m = &(c->methods[i]); - if ( !(m->flags & ACC_STATIC)) - printf ("vftblindex: %d ", m->vftblindex); - - method_display ( m ); - - } - - printf ("Virtual function table:\n"); - for (i=0; ivftbl->vftbllength; i++) { - printf ("entry: %d, %ld\n", i, (long int) (c->vftbl->table[i]) ); - } - -} - - /* loader_close **************************************************************** Frees all resources.