Edwin Steiner
Christian Thalinger
- $Id: loader.c 2182 2005-04-01 20:56:33Z edwin $
+ $Id: loader.c 3386 2005-10-07 14:02:52Z edwin $
*/
-
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "vm/statistics.h"
#include "vm/stringlocal.h"
#include "vm/tables.h"
+#include "vm/classcache.h"
#if defined(USE_ZLIB)
# include "vm/unzip.h"
#include "vm/jit/asmpart.h"
#include "vm/jit/codegen.inc.h"
+/******************************************************************************/
+/* DEBUG HELPERS */
+/******************************************************************************/
+
+/*#define LOADER_VERBOSE*/
+
+#ifndef NDEBUG
+#define LOADER_DEBUG
+#endif
+
+#ifdef LOADER_DEBUG
+#define LOADER_ASSERT(cond) assert(cond)
+#else
+#define LOADER_ASSERT(cond)
+#endif
#undef JOWENN_DEBUG
#undef JOWENN_DEBUG1
#undef JOWENN_DEBUG2
+#ifdef LOADER_VERBOSE
+static int loader_recursion = 0;
+#define LOADER_INDENT(str) do { int i; for(i=0;i<loader_recursion*4;++i) {str[i]=' ';} str[i]=0;} while (0)
+#define LOADER_INC() loader_recursion++
+#define LOADER_DEC() loader_recursion--
+#else
+#define LOADER_INC()
+#define LOADER_DEC()
+#endif
+
/********************************************************************
list of classpath entries (either filesystem directories or
classpath_info *classpath_entries = NULL;
+
/* loader_init *****************************************************************
Initializes all lists and loads all classes required for the system
bool loader_init(u1 *stackbottom)
{
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
classpath_info *cpi;
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- /* Initialize the monitor pointer for zip/jar file locking. */
+ /* Initialize the monitor pointer for zip/jar file locking. */
for (cpi = classpath_entries; cpi != NULL; cpi = cpi->next) {
if (cpi->type == CLASSPATH_ARCHIVE)
/* load some important classes */
- if (!load_class_bootstrap(class_java_lang_Object))
+ if (!(class_java_lang_Object = load_class_bootstrap(utf_java_lang_Object)))
return false;
- if (!load_class_bootstrap(class_java_lang_String))
+ if (!(class_java_lang_String = load_class_bootstrap(utf_java_lang_String)))
return false;
- if (!load_class_bootstrap(class_java_lang_Cloneable))
+ if (!(class_java_lang_Cloneable =
+ load_class_bootstrap(utf_java_lang_Cloneable)))
return false;
- if (!load_class_bootstrap(class_java_io_Serializable))
+ if (!(class_java_io_Serializable =
+ load_class_bootstrap(utf_java_io_Serializable)))
return false;
/* load classes for wrapping primitive types */
- if (!load_class_bootstrap(class_java_lang_Void))
+ if (!(class_java_lang_Void = load_class_bootstrap(utf_java_lang_Void)))
+ return false;
+
+ if (!(class_java_lang_Boolean =
+ load_class_bootstrap(utf_java_lang_Boolean)))
+ return false;
+
+ if (!(class_java_lang_Byte = load_class_bootstrap(utf_java_lang_Byte)))
+ return false;
+
+ if (!(class_java_lang_Character =
+ load_class_bootstrap(utf_java_lang_Character)))
+ return false;
+
+ if (!(class_java_lang_Short = load_class_bootstrap(utf_java_lang_Short)))
+ return false;
+
+ if (!(class_java_lang_Integer =
+ load_class_bootstrap(utf_java_lang_Integer)))
+ return false;
+
+ if (!(class_java_lang_Long = load_class_bootstrap(utf_java_lang_Long)))
+ return false;
+
+ if (!(class_java_lang_Float = load_class_bootstrap(utf_java_lang_Float)))
+ return false;
+
+ if (!(class_java_lang_Double = load_class_bootstrap(utf_java_lang_Double)))
return false;
- if (!load_class_bootstrap(class_java_lang_Boolean))
+
+ /* load some other important classes */
+
+ if (!(class_java_lang_Class = load_class_bootstrap(utf_java_lang_Class)))
+ return false;
+
+ if (!(class_java_lang_ClassLoader =
+ load_class_bootstrap(utf_java_lang_ClassLoader)))
+ return false;
+
+ if (!(class_java_lang_SecurityManager =
+ load_class_bootstrap(utf_java_lang_SecurityManager)))
+ return false;
+
+ if (!(class_java_lang_System = load_class_bootstrap(utf_java_lang_System)))
return false;
- if (!load_class_bootstrap(class_java_lang_Byte))
+ if (!(class_java_lang_Thread =
+ load_class_bootstrap(utf_new_char("java/lang/Thread"))))
return false;
- if (!load_class_bootstrap(class_java_lang_Character))
+ if (!(class_java_lang_ThreadGroup =
+ load_class_bootstrap(utf_java_lang_ThreadGroup)))
return false;
- if (!load_class_bootstrap(class_java_lang_Short))
+ if (!(class_java_lang_VMThread =
+ load_class_bootstrap(utf_new_char("java/lang/VMThread"))))
return false;
- if (!load_class_bootstrap(class_java_lang_Integer))
+
+ /* some classes which may be used more often */
+
+ if (!(class_java_lang_StackTraceElement =
+ load_class_bootstrap(utf_java_lang_StackTraceElement)))
+ return false;
+
+ if (!(class_java_lang_reflect_Constructor =
+ load_class_bootstrap(utf_java_lang_reflect_Constructor)))
return false;
- if (!load_class_bootstrap(class_java_lang_Long))
+ if (!(class_java_lang_reflect_Field =
+ load_class_bootstrap(utf_java_lang_reflect_Field)))
return false;
- if (!load_class_bootstrap(class_java_lang_Float))
+ if (!(class_java_lang_reflect_Method =
+ load_class_bootstrap(utf_java_lang_reflect_Method)))
return false;
- if (!load_class_bootstrap(class_java_lang_Double))
+ if (!(class_java_security_PrivilegedAction =
+ load_class_bootstrap(utf_new_char("java/security/PrivilegedAction"))))
return false;
+ if (!(class_java_util_Vector = load_class_bootstrap(utf_java_util_Vector)))
+ return false;
+
+ if (!(arrayclass_java_lang_Object =
+ load_class_bootstrap(utf_new_char("[Ljava/lang/Object;"))))
+ return false;
#if defined(USE_THREADS)
if (stackbottom != 0)
#endif
if (sizeof(float) != 4) {
- *exceptionptr = new_exception_message(string_java_lang_InternalError,
- "Incompatible float-format");
+ *exceptionptr = new_internalerror("Incompatible float-format");
/* XXX should we exit in such a case? */
throw_exception_exit();
u1 buffer[8];
u2 i;
+#if defined(__ARM__) && defined(__ARMEL__) && !defined(__VFP_FP__)
+ /*
+ * On little endian ARM processors when using FPA, word order
+ * of doubles is still big endian. So take that into account
+ * here. When using VFP, word order of doubles follows byte
+ * order. (michi 2005/07/24)
+ */
+ for (i = 0; i < 4; i++)
+ buffer[3 - i] = suck_u1(cb);
+ for (i = 0; i < 4; i++)
+ buffer[7 - i] = suck_u1(cb);
+#else
for (i = 0; i < 8; i++)
buffer[7 - i] = suck_u1(cb);
+#endif /* defined(__ARM__) && ... */
memcpy((u1*) (&d), buffer, 8);
#else
#endif
if (sizeof(double) != 8) {
- *exceptionptr = new_exception_message(string_java_lang_InternalError,
- "Incompatible double-format");
+ *exceptionptr = new_internalerror("Incompatible double-format");
/* XXX should we exit in such a case? */
throw_exception_exit();
cpi->next = NULL;
cpi->path = filename;
cpi->pathlen = filenamelen;
+
+ /* SUN compatible -verbose:class output */
+
+ if (opt_verboseclass)
+ printf("[Opened %s]\n", filename);
}
#else
}
-void create_all_classes()
+/* loader_load_all_classes *****************************************************
+
+ Loads all classes specified in the BOOTCLASSPATH.
+
+*******************************************************************************/
+
+void loader_load_all_classes(void)
{
classpath_info *cpi;
+ classinfo *c;
for (cpi = classpath_entries; cpi != 0; cpi = cpi->next) {
#if defined(USE_ZLIB)
ce = s->cacao_dir_list;
while (ce) {
- (void) class_new(ce->name);
+ /* skip all entries in META-INF and .properties, .png files */
+
+ if (strncmp(ce->name->text, "META-INF", strlen("META-INF")) &&
+ !strstr(ce->name->text, ".properties") &&
+ !strstr(ce->name->text, ".png"))
+ c = load_class_bootstrap(ce->name);
+
ce = ce->next;
}
if (unzOpenCurrentFile(cpi->uf) == UNZ_OK) {
cb = NEW(classbuffer);
cb->class = c;
- cb->size = file_info.uncompressed_size;
- cb->data = MNEW(u1, cb->size);
- cb->pos = cb->data - 1;
+ cb->size = file_info.uncompressed_size;
+ cb->data = MNEW(u1, cb->size);
+ cb->pos = cb->data - 1;
+ cb->path = cpi->path;
len = unzReadCurrentFile(cpi->uf, cb->data, cb->size);
if (!stat(path, &buffer)) { /* read classfile data */
cb = NEW(classbuffer);
cb->class = c;
- cb->size = buffer.st_size;
- cb->data = MNEW(u1, cb->size);
- cb->pos = cb->data - 1;
+ cb->size = buffer.st_size;
+ cb->data = MNEW(u1, cb->size);
+ cb->pos = cb->data - 1;
+ cb->path = cpi->path;
/* read class data */
len = fread(cb->data, 1, cb->size, classfile);
}
if (opt_verbose)
- if (!found)
+ if (!found) {
dolog("Warning: Can not open class file '%s'", filename);
+ if (strcmp(filename, "org/mortbay/util/MultiException.class") == 0) {
+ static int i = 0;
+ i++;
+ if (i == 3)
+ assert(0);
+ }
+ }
+
MFREE(filename, char, filenamelen);
return cb;
void printflags(u2 f)
{
- if ( f & ACC_PUBLIC ) printf (" PUBLIC");
- if ( f & ACC_PRIVATE ) printf (" PRIVATE");
- if ( f & ACC_PROTECTED ) printf (" PROTECTED");
- if ( f & ACC_STATIC ) printf (" STATIC");
- if ( f & ACC_FINAL ) printf (" FINAL");
- if ( f & ACC_SYNCHRONIZED ) printf (" SYNCHRONIZED");
- if ( f & ACC_VOLATILE ) printf (" VOLATILE");
- if ( f & ACC_TRANSIENT ) printf (" TRANSIENT");
- if ( f & ACC_NATIVE ) printf (" NATIVE");
- if ( f & ACC_INTERFACE ) printf (" INTERFACE");
- if ( f & ACC_ABSTRACT ) printf (" ABSTRACT");
+ fprintflags(stdout,f);
}
}
-/******************** function:: class_getconstant *****************************
-
- retrieves the value at position 'pos' of the constantpool of a class
- if the type of the value is other than 'ctype' the system is stopped
-
-*******************************************************************************/
-
-voidptr class_getconstant(classinfo *c, u4 pos, u4 ctype)
-{
- /* check index and type of constantpool entry */
- /* (pos == 0 is caught by type comparison) */
- if (pos >= c->cpcount || c->cptags[pos] != ctype) {
- *exceptionptr = new_classformaterror(c, "Illegal constant pool index");
- return NULL;
- }
-
- return c->cpinfos[pos];
-}
-
-
-/******************** function: innerclass_getconstant ************************
-
- like class_getconstant, but if cptags is ZERO null is returned
-
-*******************************************************************************/
-
-voidptr innerclass_getconstant(classinfo *c, u4 pos, u4 ctype)
-{
- /* invalid position in constantpool */
- if (pos >= c->cpcount) {
- *exceptionptr = new_classformaterror(c, "Illegal constant pool index");
- return NULL;
- }
-
- /* constantpool entry of type 0 */
- if (!c->cptags[pos])
- return NULL;
-
- /* check type of constantpool entry */
- if (c->cptags[pos] != ctype) {
- *exceptionptr = new_classformaterror(c, "Illegal constant pool index");
- return NULL;
- }
-
- return c->cpinfos[pos];
-}
-
-
-/********************* Function: class_constanttype ****************************
-
- Determines the type of a class entry in the ConstantPool
-
-*******************************************************************************/
-
-u4 class_constanttype(classinfo *c, u4 pos)
-{
- if (pos <= 0 || pos >= c->cpcount) {
- *exceptionptr = new_classformaterror(c, "Illegal constant pool index");
- return 0;
- }
-
- return c->cptags[pos];
-}
-
-
/* load_constantpool ***********************************************************
Loads the constantpool of a class, the entries are transformed into
*******************************************************************************/
-static bool load_constantpool(classbuffer *cb,descriptor_pool *descpool)
+static bool load_constantpool(classbuffer *cb, descriptor_pool *descpool)
{
/* The following structures are used to save information which cannot be
switch (t) {
case CONSTANT_Class:
- nfc = NEW(forward_class);
+ nfc = DNEW(forward_class);
nfc->next = forward_classes;
forward_classes = nfc;
break;
case CONSTANT_String:
- nfs = NEW(forward_string);
+ nfs = DNEW(forward_string);
nfs->next = forward_strings;
forward_strings = nfs;
break;
case CONSTANT_NameAndType:
- nfn = NEW(forward_nameandtype);
+ nfn = DNEW(forward_nameandtype);
nfn->next = forward_nameandtypes;
forward_nameandtypes = nfn;
case CONSTANT_Fieldref:
case CONSTANT_Methodref:
case CONSTANT_InterfaceMethodref:
- nff = NEW(forward_fieldmethint);
+ nff = DNEW(forward_fieldmethint);
nff->next = forward_fieldmethints;
forward_fieldmethints = nff;
if (opt_verify &&
!is_valid_utf((char *) (cb->pos + 1),
(char *) (cb->pos + 1 + length))) {
- dolog("Invalid UTF-8 string (constant pool index %d)",idx);
- panic("Invalid UTF-8 string");
+ *exceptionptr = new_classformaterror(c,"Invalid UTF-8 string");
+ return false;
}
/* insert utf-string into the utf-symboltable */
cpinfos[idx] = utf_new_intern((char *) (cb->pos + 1), length);
} /* end switch */
} /* end while */
- /* add all class references to the descriptor_pool */
- for (nfc=forward_classes; nfc; nfc=nfc->next) {
- utf *name = class_getconstant(c,nfc->name_index,CONSTANT_Utf8);
- if (!descriptor_pool_add_class(descpool,name))
- return false;
- }
- /* add all descriptors in NameAndTypes to the descriptor_pool */
- for (nfn=forward_nameandtypes; nfn; nfn=nfn->next) {
- utf *desc = class_getconstant(c,nfn->sig_index,CONSTANT_Utf8);
- if (!descriptor_pool_add(descpool,desc,NULL))
- return false;
- }
/* resolve entries in temporary structures */
while (forward_classes) {
utf *name =
class_getconstant(c, forward_classes->name_index, CONSTANT_Utf8);
+ if (!name)
+ return false;
+
+ if (opt_verify && !is_valid_name_utf(name)) {
+ *exceptionptr =
+ new_classformaterror(c, "Class reference with invalid name");
+ return false;
+ }
- if (opt_verify && !is_valid_name_utf(name))
- panic("Class reference with invalid name");
+ /* add all class references to the descriptor_pool */
+
+ if (!descriptor_pool_add_class(descpool, name))
+ return false;
cptags[forward_classes->thisindex] = CONSTANT_Class;
- /* retrieve class from class-table */
+
if (opt_eager) {
classinfo *tc;
- tc = class_new_intern(name);
- if (!load_class_from_classloader(tc, c->classloader))
+ if (!(tc = load_class_bootstrap(name)))
return false;
/* link the class later, because we cannot link the class currently
loading */
list_addfirst(&unlinkedclasses, tc);
-
- cpinfos[forward_classes->thisindex] = tc;
-
- } else {
- cpinfos[forward_classes->thisindex] = class_new(name);
}
+ /* the classref is created later */
+ cpinfos[forward_classes->thisindex] = name;
+
nfc = forward_classes;
forward_classes = forward_classes->next;
- FREE(nfc, forward_class);
}
while (forward_strings) {
utf *text =
class_getconstant(c, forward_strings->string_index, CONSTANT_Utf8);
+ if (!text)
+ return false;
/* resolve utf-string */
cptags[forward_strings->thisindex] = CONSTANT_String;
nfs = forward_strings;
forward_strings = forward_strings->next;
- FREE(nfs, forward_string);
}
while (forward_nameandtypes) {
cn->name = class_getconstant(c,
forward_nameandtypes->name_index,
CONSTANT_Utf8);
+ if (!cn->name)
+ return false;
cn->descriptor = class_getconstant(c,
forward_nameandtypes->sig_index,
CONSTANT_Utf8);
+ if (!cn->descriptor)
+ return false;
if (opt_verify) {
/* check name */
/* disallow referencing <clinit> among others */
if (cn->name->text[0] == '<' && cn->name != utf_init) {
*exceptionptr =
- new_exception_utfmessage(string_java_lang_InternalError,
- cn->name);
+ new_classformaterror(c,"Illegal reference to special method");
return false;
}
}
nfn = forward_nameandtypes;
forward_nameandtypes = forward_nameandtypes->next;
- FREE(nfn, forward_nameandtype);
}
while (forward_fieldmethints) {
count_const_pool_len += sizeof(constant_FMIref);
#endif
/* resolve simple name and descriptor */
+
nat = class_getconstant(c,
forward_fieldmethints->nameandtype_index,
CONSTANT_NameAndType);
+ if (!nat)
+ return false;
+
+ /* add all descriptors in {Field,Method}ref to the descriptor_pool */
+
+ if (!descriptor_pool_add(descpool, nat->descriptor, NULL))
+ return false;
- fmi->class = class_getconstant(c,
- forward_fieldmethints->class_index,
- CONSTANT_Class);
+ /* the classref is created later */
+
+ fmi->classref = (constant_classref *) (size_t) forward_fieldmethints->class_index;
fmi->name = nat->name;
fmi->descriptor = nat->descriptor;
nff = forward_fieldmethints;
forward_fieldmethints = forward_fieldmethints->next;
- FREE(nff, forward_fieldmethint);
}
/* everything was ok */
#define field_load_NOVALUE 0xffffffff /* must be bigger than any u2 value! */
-static bool load_field(classbuffer *cb, fieldinfo *f,descriptor_pool *descpool)
+static bool load_field(classbuffer *cb, fieldinfo *f, descriptor_pool *descpool)
{
classinfo *c;
u4 attrnum, i;
if (!(u = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
return false;
+
f->name = u;
if (!(u = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
return false;
+
f->descriptor = u;
f->parseddesc = NULL;
- if (!descriptor_pool_add(descpool,u,NULL))
+
+ 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] == '<') {
*******************************************************************************/
-static bool load_method(classbuffer *cb, methodinfo *m,descriptor_pool *descpool)
+static bool load_method(classbuffer *cb, methodinfo *m, descriptor_pool *descpool)
{
classinfo *c;
int argcount;
if (!(u = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
return false;
+
m->name = u;
if (!(u = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
return false;
+
m->descriptor = u;
m->parseddesc = NULL;
- if (!descriptor_pool_add(descpool,u,&argcount))
+
+ if (!descriptor_pool_add(descpool, u, &argcount))
return false;
if (opt_verify) {
- if (!is_valid_name_utf(m->name))
- panic("Method with invalid name");
+ if (!is_valid_name_utf(m->name)) {
+ *exceptionptr = new_classformaterror(c,"Method with invalid name");
+ return false;
+ }
- if (m->name->text[0] == '<'
- && m->name != utf_init && m->name != utf_clinit)
- panic("Method with invalid special name");
+ if (m->name->text[0] == '<' &&
+ m->name != utf_init && m->name != utf_clinit) {
+ *exceptionptr = new_classformaterror(c,"Method with invalid special name");
+ return false;
+ }
}
if (!(m->flags & ACC_STATIC))
if (m->name == utf_init) {
if (m->flags & (ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED |
- ACC_NATIVE | ACC_ABSTRACT))
- panic("Instance initialization method has invalid flags set");
+ ACC_NATIVE | ACC_ABSTRACT)) {
+ *exceptionptr = new_classformaterror(c,
+ "Instance initialization method has invalid flags set");
+ return false;
+ }
}
}
}
idx = suck_u2(cb);
if (!idx) {
- m->exceptiontable[j].catchtype = NULL;
+ m->exceptiontable[j].catchtype.any = NULL;
} else {
- if (!(m->exceptiontable[j].catchtype =
- class_getconstant(c, idx, CONSTANT_Class)))
+ /* the classref is created later */
+ if (!(m->exceptiontable[j].catchtype.any =
+ (utf*)class_getconstant(c, idx, CONSTANT_Class)))
return false;
}
}
if (!check_classbuffer_size(cb, 2 * m->thrownexceptionscount))
return false;
- m->thrownexceptions = MNEW(classinfo*, m->thrownexceptionscount);
+ m->thrownexceptions = MNEW(classref_or_classinfo, m->thrownexceptionscount);
for (j = 0; j < m->thrownexceptionscount; j++) {
- if (!((m->thrownexceptions)[j] =
- class_getconstant(c, suck_u2(cb), CONSTANT_Class)))
+ /* the classref is created later */
+ if (!((m->thrownexceptions)[j].any =
+ (utf*) class_getconstant(c, suck_u2(cb), CONSTANT_Class)))
return false;
}
innerclassinfo *info = c->innerclass + j;
- info->inner_class =
+ info->inner_class.ref =
innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
- info->outer_class =
+ info->outer_class.ref =
innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
info->name =
innerclass_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
}
-/* load_class_from_classloader *************************************************
+/* load_class_from_sysloader ***************************************************
+
+ Load the class with the given name using the system class loader
+
+ IN:
+ name.............the classname
+
+ RETURN VALUE:
+ the loaded class, or
+ NULL if an exception has been thrown
- XXX
+*******************************************************************************/
+
+classinfo *load_class_from_sysloader(utf *name)
+{
+ methodinfo *m;
+ java_objectheader *cl;
+ classinfo *r;
+
+#ifdef LOADER_VERBOSE
+ char logtext[MAXLOGTEXT];
+ LOADER_INDENT(logtext);
+ sprintf(logtext+strlen(logtext),"load_class_from_sysloader(");
+ utf_sprint(logtext+strlen(logtext),name);strcat(logtext,")");
+ log_text(logtext);
+#endif
+
+ LOADER_ASSERT(class_java_lang_Object);
+ LOADER_ASSERT(class_java_lang_ClassLoader);
+ LOADER_ASSERT(class_java_lang_ClassLoader->linked);
+ m = class_resolveclassmethod(class_java_lang_ClassLoader,
+ utf_getSystemClassLoader,
+ utf_void__java_lang_ClassLoader,
+ class_java_lang_Object,
+ false);
+
+ if (!m)
+ return false;
+
+ cl = (java_objectheader *) asm_calljavafunction(m, NULL, NULL, NULL, NULL);
+ if (!cl)
+ return false;
+
+ LOADER_INC();
+ r = load_class_from_classloader(name, cl);
+ LOADER_DEC();
+
+ return r;
+}
+
+/* load_class_from_classloader *************************************************
+
+ Load the class with the given name using the given user-defined class loader.
+
+ IN:
+ name.............the classname
+ cl...............user-defined class loader
+
+ RETURN VALUE:
+ the loaded class, or
+ NULL if an exception has been thrown
+
*******************************************************************************/
-classinfo *load_class_from_classloader(classinfo *c, java_objectheader *cl)
+classinfo *load_class_from_classloader(utf *name, java_objectheader *cl)
{
classinfo *r;
+#ifdef LOADER_VERBOSE
+ char logtext[MAXLOGTEXT];
+ LOADER_INDENT(logtext);
+ strcat(logtext,"load_class_from_classloader(");
+ utf_sprint(logtext+strlen(logtext),name);sprintf(logtext+strlen(logtext),",%p,",(void*)cl);
+ if (!cl) strcat(logtext,"<bootstrap>");
+ else if (cl->vftbl && cl->vftbl->class) utf_sprint(logtext+strlen(logtext),cl->vftbl->class->name);
+ else strcat(logtext,"<unknown class>");
+ strcat(logtext,")");
+ log_text(logtext);
+#endif
+
+ LOADER_ASSERT(name);
+
+ /* lookup if this class has already been loaded */
+
+ r = classcache_lookup(cl, name);
+
+#ifdef LOADER_VERBOSE
+ if (r)
+ dolog(" cached -> %p",(void*)r);
+#endif
+
+ if (r)
+ return r;
+
/* if other class loader than bootstrap, call it */
if (cl) {
methodinfo *lc;
+ char *text;
+ s4 namelen;
+
+ text = name->text;
+ namelen = name->blength;
+
+ /* handle array classes */
+ if (text[0] == '[') {
+ classinfo *comp;
+ utf *u;
+
+ switch (text[1]) {
+ 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);
+ return false;
+ }
+
+ u = utf_new(text + 2, namelen - 3);
+
+ if (!(comp = load_class_from_classloader(u, cl)))
+ return false;
+
+ /* create the array class */
+ return class_array_of(comp, false);
+
+ case '[':
+ /* load the component class */
+
+ u = utf_new(text + 1, namelen - 1);
+
+ if (!(comp = load_class_from_classloader(u, cl)))
+ return false;
+
+ /* create the array class */
+ return class_array_of(comp, false);
+
+ default:
+ /* primitive array classes are loaded by the bootstrap loader */
+ return load_class_bootstrap(name);
+ }
+ }
+
+ LOADER_ASSERT(class_java_lang_Object);
lc = class_resolveclassmethod(cl->vftbl->class,
utf_loadClass,
true);
if (!lc)
- return NULL;
+ return false; /* exception */
+ LOADER_INC();
r = (classinfo *) asm_calljavafunction(lc,
cl,
- javastring_new(c->name),
+ javastring_new_slash_to_dot(name),
NULL, NULL);
+ LOADER_DEC();
+
+ if (r) {
+ /* Store this class in the loaded class cache. If another
+ class with the same (initloader,name) pair has been
+ stored earlier it will be returned by classcache_store
+ In this case classcache_store may not free the class
+ because it has already been exposed to Java code which
+ may have kept references to that class. */
+
+ classinfo *c = classcache_store(cl,r,false);
+
+ if (c == NULL) {
+ /* exception, free the loaded class */
+ r->loaded = false;
+ class_free(r);
+ }
+
+ r = c;
+ }
+
+ /* SUN compatible -verbose:class output */
+
+ if (opt_verboseclass && (r != NULL) && (r->classloader == cl)) {
+ printf("[Loaded ");
+ utf_display_classname(name);
+ printf("]\n");
+ }
return r;
+ }
- } else {
- return load_class_bootstrap(c);
- }
+ LOADER_INC();
+ r = load_class_bootstrap(name);
+ LOADER_DEC();
+
+ return r;
}
/* load_class_bootstrap ********************************************************
- XXX
+ Load the class with the given name using the bootstrap class loader.
+
+ IN:
+ name.............the classname
+
+ RETURN VALUE:
+ loaded classinfo, or
+ NULL if an exception has been thrown
+
+ SYNCHRONIZATION:
+ load_class_bootstrap is synchronized. It can be treated as an
+ atomic operation.
*******************************************************************************/
-classinfo *load_class_bootstrap(classinfo *c)
+classinfo *load_class_bootstrap(utf *name)
{
classbuffer *cb;
- classinfo *r;
+ classinfo *c;
+ classinfo *r;
+#ifdef LOADER_VERBOSE
+ char logtext[MAXLOGTEXT];
+#endif
-#if defined(USE_THREADS)
- /* enter a monitor on the class */
+ /* for debugging */
- builtin_monitorenter((java_objectheader *) c);
-#endif
+ LOADER_ASSERT(name);
+ LOADER_INC();
- /* maybe the class is already loaded */
+ /* lookup if this class has already been loaded */
- if (c->loaded) {
-#if defined(USE_THREADS)
- builtin_monitorexit((java_objectheader *) c);
+ if ((r = classcache_lookup(NULL, name)))
+ goto success;
+
+#ifdef LOADER_VERBOSE
+ LOADER_INDENT(logtext);
+ strcat(logtext,"load_class_bootstrap(");
+ utf_sprint(logtext+strlen(logtext),name);strcat(logtext,")");
+ log_text(logtext);
#endif
- return c;
+ /* create the classinfo */
+
+ c = class_create_classinfo(name);
+
+ /* handle array classes */
+
+ if (name->text[0] == '[') {
+ c = load_newly_created_array(c, NULL);
+ if (c == NULL)
+ goto return_exception;
+ LOADER_ASSERT(c->loaded);
+ r = c;
+ goto success;
}
#if defined(STATISTICS)
/* load classdata, throw exception on error */
if ((cb = suck_start(c)) == NULL) {
- /* this means, the classpath was not set properly */
- if (c->name == utf_java_lang_Object)
+ /* this normally means, the classpath was not set properly */
+
+ if (name == utf_java_lang_Object)
throw_cacao_exception_exit(string_java_lang_NoClassDefFoundError,
"java/lang/Object");
*exceptionptr =
new_exception_utfmessage(string_java_lang_NoClassDefFoundError,
- c->name);
-
-#if defined(USE_THREADS)
- builtin_monitorexit((java_objectheader *) c);
-#endif
-
- return NULL;
+ name);
+ goto return_exception;
}
/* load the class from the buffer */
r = load_class_from_classbuffer(cb);
- /* if return value is NULL, we had a problem and the class is not loaded */
if (!r) {
- c->loaded = false;
+ /* the class could not be loaded, free the classinfo struct */
+
+ class_free(c);
+
+ } else {
+ /* Store this class in the loaded class cache this step also
+ checks the loading constraints. If the class has been loaded
+ before, the earlier loaded class is returned. */
+
+ classinfo *res = classcache_store(NULL, c, true);
- /* now free the allocated memory, otherwise we could ran into a DOS */
- class_remove(c);
+ if (!res) {
+ /* exception */
+ class_free(c);
+ }
+
+ r = res;
+ }
+
+ /* SUN compatible -verbose:class output */
+
+ if (opt_verboseclass && r) {
+ printf("[Loaded ");
+ utf_display_classname(name);
+ printf(" from %s]\n", cb->path);
}
/* free memory */
+
suck_stop(cb);
#if defined(STATISTICS)
compilingtime_start();
#endif
-#if defined(USE_THREADS)
- /* leave the monitor */
+ if (!r)
+ goto return_exception;
- builtin_monitorexit((java_objectheader *) c);
-#endif
+success:
+ LOADER_DEC();
return r;
+
+return_exception:
+ LOADER_DEC();
+
+ return NULL;
}
The loaded class is removed from the list 'unloadedclasses' and
added to the list 'unlinkedclasses'.
+ SYNCHRONIZATION:
+ This function is NOT synchronized!
+
*******************************************************************************/
classinfo *load_class_from_classbuffer(classbuffer *cb)
{
classinfo *c;
- classinfo *tc;
- u4 i;
+ utf *name;
+ utf *supername;
+ u4 i,j;
u4 ma, mi;
s4 dumpsize;
descriptor_pool *descpool;
- char msg[MAXLOGTEXT]; /* maybe we get an exception */
#if defined(STATISTICS)
u4 classrefsize;
u4 descsize;
#endif
+#ifdef LOADER_VERBOSE
+ char logtext[MAXLOGTEXT];
+#endif
/* get the classbuffer's class */
+
c = cb->class;
/* maybe the class is already loaded */
+
if (c->loaded)
return c;
+#ifdef LOADER_VERBOSE
+ LOADER_INDENT(logtext);
+ strcat(logtext,"load_class_from_classbuffer(");
+ utf_sprint(logtext+strlen(logtext),c->name);strcat(logtext,")");
+ log_text(logtext);
+ LOADER_INC();
+#endif
+
#if defined(STATISTICS)
if (opt_stat)
count_class_loads++;
#endif
/* output for debugging purposes */
+
if (loadverbose)
log_message_class("Loading class: ", c);
/* mark start of dump memory area */
+
dumpsize = dump_size();
/* class is somewhat loaded */
+
c->loaded = true;
if (!check_classbuffer_size(cb, 4 + 2 + 2))
goto return_exception;
/* check signature */
+
if (suck_u4(cb) != MAGIC) {
*exceptionptr = new_classformaterror(c, "Bad magic number");
}
/* check version */
+
mi = suck_u2(cb);
ma = suck_u2(cb);
}
/* create a new descriptor pool */
+
descpool = descriptor_pool_new(c);
-
+
/* load the constant pool */
- if (!load_constantpool(cb,descpool))
+
+ if (!load_constantpool(cb, descpool))
goto return_exception;
/*JOWENN*/
c->impldBy = NULL;
/* ACC flags */
+
if (!check_classbuffer_size(cb, 2))
goto return_exception;
c->flags = suck_u2(cb);
- /*if (!(c->flags & ACC_PUBLIC)) { log_text("CLASS NOT PUBLIC"); } JOWENN*/
/* check ACC flags consistency */
+
if (c->flags & ACC_INTERFACE) {
if (!(c->flags & ACC_ABSTRACT)) {
/* We work around this because interfaces in JDK 1.1 are
* not declared abstract. */
c->flags |= ACC_ABSTRACT;
- /* panic("Interface class not declared abstract"); */
}
if (c->flags & ACC_FINAL) {
goto return_exception;
/* this class */
+
i = suck_u2(cb);
- if (!(tc = class_getconstant(c, i, CONSTANT_Class)))
+ if (!(name = (utf *) class_getconstant(c, i, CONSTANT_Class)))
goto return_exception;
- if (tc != c) {
+ if (c->name == utf_not_named_yet) {
+ /* we finally have a name for this class */
+ c->name = name;
+ class_set_packagename(c);
+
+ } else if (name != c->name) {
+ char *msg;
+ s4 msglen;
+
+ msglen = utf_strlen(c->name) + strlen(" (wrong name: ") +
+ utf_strlen(name) + strlen(")") + strlen("0");
+
+ msg = MNEW(char, msglen);
+
utf_sprint(msg, c->name);
- sprintf(msg + strlen(msg), " (wrong name: ");
- utf_sprint(msg + strlen(msg), tc->name);
- sprintf(msg + strlen(msg), ")");
+ strcat(msg, " (wrong name: ");
+ utf_strcat(msg, name);
+ strcat(msg, ")");
*exceptionptr =
new_exception_message(string_java_lang_NoClassDefFoundError, msg);
+ MFREE(msg, char, msglen);
+
goto return_exception;
}
/* retrieve superclass */
+
+ c->super.any = NULL;
if ((i = suck_u2(cb))) {
- if (!(c->super = class_getconstant(c, i, CONSTANT_Class)))
+ if (!(supername = (utf *) class_getconstant(c, i, CONSTANT_Class)))
goto return_exception;
/* java.lang.Object may not have a super class. */
+
if (c->name == utf_java_lang_Object) {
*exceptionptr =
new_exception_message(string_java_lang_ClassFormatError,
}
/* Interfaces must have java.lang.Object as super class. */
+
if ((c->flags & ACC_INTERFACE) &&
- c->super->name != utf_java_lang_Object) {
+ supername != utf_java_lang_Object) {
*exceptionptr =
new_exception_message(string_java_lang_ClassFormatError,
"Interfaces must have java.lang.Object as superclass");
}
} else {
- c->super = NULL;
+ supername = NULL;
/* This is only allowed for java.lang.Object. */
+
if (c->name != utf_java_lang_Object) {
*exceptionptr = new_classformaterror(c, "Bad superclass index");
}
/* retrieve interfaces */
+
if (!check_classbuffer_size(cb, 2))
goto return_exception;
if (!check_classbuffer_size(cb, 2 * c->interfacescount))
goto return_exception;
- c->interfaces = MNEW(classinfo*, c->interfacescount);
+ c->interfaces = MNEW(classref_or_classinfo, c->interfacescount);
for (i = 0; i < c->interfacescount; i++) {
- if (!(c->interfaces[i] = class_getconstant(c, suck_u2(cb), CONSTANT_Class)))
+ /* the classrefs are created later */
+ if (!(c->interfaces[i].any = (utf *) class_getconstant(c, suck_u2(cb), CONSTANT_Class)))
goto return_exception;
}
}
/* create the class reference table */
- c->classrefs = descriptor_pool_create_classrefs(descpool,&(c->classrefcount));
+
+ c->classrefs =
+ descriptor_pool_create_classrefs(descpool, &(c->classrefcount));
/* allocate space for the parsed descriptors */
+
descriptor_pool_alloc_parsed_descriptors(descpool);
- c->parseddescs = descriptor_pool_get_parsed_descriptors(descpool,&(c->parseddescsize));
+ c->parseddescs =
+ descriptor_pool_get_parsed_descriptors(descpool, &(c->parseddescsize));
#if defined(STATISTICS)
if (opt_stat) {
- descriptor_pool_get_sizes(descpool,&classrefsize,&descsize);
+ descriptor_pool_get_sizes(descpool, &classrefsize, &descsize);
count_classref_len += classrefsize;
count_parsed_desc_len += descsize;
}
#endif
- /* parse the loaded descriptors */
- for (i=0; i<c->cpcount; ++i) {
- constant_FMIref *fmi;
-
- switch (c->cptags[i]) {
- case CONSTANT_Class:
- /* XXX set classref */
- break;
- case CONSTANT_Fieldref:
- fmi = (constant_FMIref *)c->cpinfos[i];
- fmi->parseddesc.fd =
- descriptor_pool_parse_field_descriptor(descpool,fmi->descriptor);
- if (!fmi->parseddesc.fd)
- goto return_exception;
- fmi->classref = descriptor_pool_lookup_classref(descpool,fmi->class->name);
- break;
- case CONSTANT_Methodref:
- case CONSTANT_InterfaceMethodref:
- fmi = (constant_FMIref *)c->cpinfos[i];
- fmi->parseddesc.md =
- descriptor_pool_parse_method_descriptor(descpool,fmi->descriptor);
- if (!fmi->parseddesc.md)
- goto return_exception;
- fmi->classref = descriptor_pool_lookup_classref(descpool,fmi->class->name);
- break;
+ /* put the classrefs in the constant pool */
+ for (i = 0; i < c->cpcount; i++) {
+ if (c->cptags[i] == CONSTANT_Class) {
+ utf *name = (utf *) c->cpinfos[i];
+ c->cpinfos[i] = descriptor_pool_lookup_classref(descpool, name);
}
}
+
+ /* set the super class reference */
+
+ if (supername) {
+ c->super.ref = descriptor_pool_lookup_classref(descpool, supername);
+ if (!c->super.ref)
+ goto return_exception;
+ }
+
+ /* set the super interfaces references */
+
+ for (i = 0; i < c->interfacescount; i++) {
+ c->interfaces[i].ref =
+ descriptor_pool_lookup_classref(descpool,
+ (utf *) c->interfaces[i].any);
+ if (!c->interfaces[i].ref)
+ goto return_exception;
+ }
+
+ /* parse field descriptors */
+
for (i = 0; i < c->fieldscount; i++) {
- c->fields[i].parseddesc = descriptor_pool_parse_field_descriptor(descpool,c->fields[i].descriptor);
+ c->fields[i].parseddesc =
+ descriptor_pool_parse_field_descriptor(descpool,
+ c->fields[i].descriptor);
if (!c->fields[i].parseddesc)
goto return_exception;
}
+
+ /* parse method descriptors */
+
for (i = 0; i < c->methodscount; i++) {
- c->methods[i].parseddesc = descriptor_pool_parse_method_descriptor(descpool,c->methods[i].descriptor);
- if (!c->methods[i].parseddesc)
+ methodinfo *m = &c->methods[i];
+ m->parseddesc =
+ descriptor_pool_parse_method_descriptor(descpool, m->descriptor,
+ m->flags, class_get_self_classref(m->class));
+ if (!m->parseddesc)
goto return_exception;
+
+ for (j = 0; j < m->exceptiontablelength; j++) {
+ if (!m->exceptiontable[j].catchtype.any)
+ continue;
+ if ((m->exceptiontable[j].catchtype.ref =
+ descriptor_pool_lookup_classref(descpool,
+ (utf *) m->exceptiontable[j].catchtype.any)) == NULL)
+ goto return_exception;
+ }
+
+ for (j = 0; j < m->thrownexceptionscount; j++) {
+ if (!m->thrownexceptions[j].any)
+ continue;
+ if ((m->thrownexceptions[j].ref = descriptor_pool_lookup_classref(descpool,
+ (utf *) m->thrownexceptions[j].any)) == NULL)
+ goto return_exception;
+ }
+ }
+
+ /* parse the loaded descriptors */
+
+ for (i = 0; i < c->cpcount; i++) {
+ constant_FMIref *fmi;
+ s4 index;
+
+ switch (c->cptags[i]) {
+ case CONSTANT_Fieldref:
+ fmi = (constant_FMIref *) c->cpinfos[i];
+ fmi->parseddesc.fd =
+ descriptor_pool_parse_field_descriptor(descpool,
+ fmi->descriptor);
+ if (!fmi->parseddesc.fd)
+ goto return_exception;
+ index = (int) (size_t) fmi->classref;
+ fmi->classref =
+ (constant_classref *) class_getconstant(c, index,
+ CONSTANT_Class);
+ if (!fmi->classref)
+ goto return_exception;
+ break;
+ case CONSTANT_Methodref:
+ case CONSTANT_InterfaceMethodref:
+ fmi = (constant_FMIref *) c->cpinfos[i];
+ index = (int) (size_t) fmi->classref;
+ fmi->classref =
+ (constant_classref *) class_getconstant(c, index,
+ CONSTANT_Class);
+ if (!fmi->classref)
+ goto return_exception;
+ fmi->parseddesc.md =
+ descriptor_pool_parse_method_descriptor(descpool,
+ fmi->descriptor,
+ ACC_UNDEF,
+ fmi->classref);
+ if (!fmi->parseddesc.md)
+ goto return_exception;
+ break;
+ }
}
/* Check if all fields and methods can be uniquely
* identified by (name,descriptor). */
+
if (opt_verify) {
/* We use a hash table here to avoid making the
* average case quadratic in # of methods, fields.
#endif
/* load attribute structures */
+
if (!check_classbuffer_size(cb, 2))
goto return_exception;
#endif
/* release dump area */
+
dump_release(dumpsize);
if (loadverbose)
log_message_class("Loading done class: ", c);
+ LOADER_DEC();
return c;
return_exception:
/* release dump area */
+
dump_release(dumpsize);
/* an exception has been thrown */
+
+ LOADER_DEC();
return NULL;
}
+/* load_newly_created_array ****************************************************
+
+ Load a newly created array class.
-/******************* Function: class_new_array *********************************
+ RETURN VALUE:
+ c....................the array class C has been loaded
+ other classinfo......the array class was found in the class cache,
+ C has been freed
+ NULL.................an exception has been thrown
- This function is called by class_new to setup an array class.
+ Note:
+ This is an internal function. Do not use it unless you know exactly
+ what you are doing!
+
+ Use one of the load_class_... functions for general array class loading.
*******************************************************************************/
-void class_new_array(classinfo *c)
+classinfo *load_newly_created_array(classinfo *c, java_objectheader *loader)
{
- classinfo *comp = NULL;
- methodinfo *clone;
- methoddesc *clonedesc;
+ classinfo *comp = NULL;
+ methodinfo *clone;
+ methoddesc *clonedesc;
constant_classref *classrefs;
- int namelen;
+ char *text;
+ s4 namelen;
+ utf *u;
+
+#ifdef LOADER_VERBOSE
+ char logtext[MAXLOGTEXT];
+ LOADER_INDENT(logtext);
+ strcat(logtext,"load_newly_created_array(");utf_sprint_classname(logtext+strlen(logtext),c->name);
+ sprintf(logtext+strlen(logtext),") loader=%p",loader);
+ log_text(logtext);
+#endif
- /* Check array class name */
+ text = c->name->text;
namelen = c->name->blength;
- if (namelen < 2 || c->name->text[0] != '[')
- panic("Invalid array class name");
- /* Check the component type */
- switch (c->name->text[1]) {
+ /* Check array class name */
+
+ if (namelen < 2 || text[0] != '[') {
+ *exceptionptr = new_classnotfoundexception(c->name);
+ return NULL;
+ }
+
+ /* Check the element type */
+
+ switch (text[1]) {
case '[':
/* c is an array of arrays. We have to create the component class. */
- if (opt_eager) {
- comp = class_new_intern(utf_new_intern(c->name->text + 1,
- namelen - 1));
- load_class_from_classloader(comp, c->classloader);
- list_addfirst(&unlinkedclasses, comp);
- } else {
- comp = class_new(utf_new_intern(c->name->text + 1, namelen - 1));
+ u = utf_new_intern(text + 1, namelen - 1);
+ LOADER_INC();
+ if (!(comp = load_class_from_classloader(u, loader))) {
+ LOADER_DEC();
+ return NULL;
}
+ LOADER_DEC();
+ LOADER_ASSERT(comp->loaded);
+ if (opt_eager)
+ if (!link_class(c))
+ return NULL;
+
+ /* the array's flags are that of the component class */
+ c->flags = (comp->flags & ~ACC_INTERFACE) | ACC_FINAL | ACC_ABSTRACT;
+ c->classloader = comp->classloader;
break;
case 'L':
/* c is an array of objects. */
- if (namelen < 4 || c->name->text[namelen - 1] != ';')
- panic("Invalid array class name");
- if (opt_eager) {
- comp = class_new_intern(utf_new_intern(c->name->text + 2,
- namelen - 3));
- load_class_from_classloader(comp, c->classloader);
- list_addfirst(&unlinkedclasses, comp);
+ /* 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);
+ return NULL;
+ }
- } else {
- comp = class_new(utf_new_intern(c->name->text + 2, namelen - 3));
+ u = utf_new_intern(text + 2, namelen - 3);
+
+ LOADER_INC();
+ if (!(comp = load_class_from_classloader(u, loader))) {
+ LOADER_DEC();
+ return NULL;
}
+ LOADER_DEC();
+ LOADER_ASSERT(comp->loaded);
+ if (opt_eager)
+ if (!link_class(c))
+ return NULL;
+
+ /* the array's flags are that of the component class */
+ c->flags = (comp->flags & ~ACC_INTERFACE) | ACC_FINAL | ACC_ABSTRACT;
+ c->classloader = comp->classloader;
break;
+
+ default:
+ /* c is an array of a primitive type */
+
+ /* check for cases like `[II' */
+ if (namelen > 2) {
+ *exceptionptr = new_classnotfoundexception(c->name);
+ return NULL;
+ }
+
+ /* the accessibility of the array class is public (VM Spec 5.3.3) */
+ c->flags = ACC_PUBLIC | ACC_FINAL | ACC_ABSTRACT;
+ c->classloader = NULL;
}
- /* Setup the array class */
- c->super = class_java_lang_Object;
- c->flags = ACC_PUBLIC | ACC_FINAL | ACC_ABSTRACT;
+ LOADER_ASSERT(class_java_lang_Object);
+ LOADER_ASSERT(class_java_lang_Cloneable);
+ LOADER_ASSERT(class_java_io_Serializable);
+
+ /* setup the array class */
+
+ c->super.cls = class_java_lang_Object;
c->interfacescount = 2;
- c->interfaces = MNEW(classinfo*, 2);
+ c->interfaces = MNEW(classref_or_classinfo, 2);
if (opt_eager) {
classinfo *tc;
tc = class_java_lang_Cloneable;
- load_class_bootstrap(tc);
+ LOADER_ASSERT(tc->loaded);
list_addfirst(&unlinkedclasses, tc);
- c->interfaces[0] = tc;
+ c->interfaces[0].cls = tc;
tc = class_java_io_Serializable;
- load_class_bootstrap(tc);
+ LOADER_ASSERT(tc->loaded);
list_addfirst(&unlinkedclasses, tc);
- c->interfaces[1] = tc;
+ c->interfaces[1].cls = tc;
} else {
- c->interfaces[0] = class_java_lang_Cloneable;
- c->interfaces[1] = class_java_io_Serializable;
+ c->interfaces[0].cls = class_java_lang_Cloneable;
+ c->interfaces[1].cls = class_java_io_Serializable;
}
c->methodscount = 1;
c->methods = MNEW(methodinfo, c->methodscount);
- classrefs = MNEW(constant_classref,1);
- CLASSREF_INIT(classrefs[0],c,utf_java_lang_Object);
+ classrefs = MNEW(constant_classref, 2);
+ CLASSREF_INIT(classrefs[0], c, c->name);
+ CLASSREF_INIT(classrefs[1], c, utf_java_lang_Object);
+ /* create descriptor for clone method */
+ /* we need one paramslot which is reserved for the 'this' parameter */
clonedesc = NEW(methoddesc);
clonedesc->returntype.type = TYPE_ADDRESS;
- clonedesc->returntype.classref = classrefs;
+ clonedesc->returntype.classref = classrefs + 1;
clonedesc->returntype.arraydim = 0;
+ /* initialize params to "empty", add real params below in
+ descriptor_params_from_paramtypes */
clonedesc->paramcount = 0;
clonedesc->paramslots = 0;
+ clonedesc->paramtypes[0].classref = classrefs + 0;
+
+ /* create methodinfo */
clone = c->methods;
MSET(clone, 0, methodinfo, 1);
- clone->flags = ACC_PUBLIC;
- clone->name = utf_new_char("clone");
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ initObjectLock(&clone->header);
+#endif
+
+ /* if you delete the ACC_NATIVE below, set clone->maxlocals=1 (interpreter
+ related) */
+ clone->flags = ACC_PUBLIC | ACC_NATIVE;
+ clone->name = utf_clone;
clone->descriptor = utf_void__java_lang_Object;
clone->parseddesc = clonedesc;
clone->class = c;
- clone->stubroutine = createnativestub((functionptr) &builtin_clone_array, clone);
clone->monoPoly = MONO;
+ /* parse the descriptor to get the register allocation */
+
+ if (!descriptor_params_from_paramtypes(clonedesc, clone->flags))
+ return false;
+
+ clone->entrypoint =
+ codegen_createnativestub((functionptr) &builtin_clone_array, clone);
+
/* XXX: field: length? */
/* array classes are not loaded from class files */
+
c->loaded = true;
- c->parseddescs = (u1*) clonedesc;
+ c->parseddescs = (u1 *) clonedesc;
c->parseddescsize = sizeof(methodinfo);
c->classrefs = classrefs;
c->classrefcount = 1;
- /* XXX insert class into the loaded class cache */
-}
-
-
-/************************* Function: class_findfield ***************************
-
- Searches a 'classinfo' structure for a field having the given name and
- type.
+ /* insert class into the loaded class cache */
+ /* XXX free classinfo if NULL returned? */
-*******************************************************************************/
-
-fieldinfo *class_findfield(classinfo *c, utf *name, utf *desc)
-{
- s4 i;
-
- for (i = 0; i < c->fieldscount; i++) {
- if ((c->fields[i].name == name) && (c->fields[i].descriptor == desc))
- return &(c->fields[i]);
- }
-
- panic("Can not find field given in CONSTANT_Fieldref");
-
- /* keep compiler happy */
- return NULL;
+ return classcache_store(loader,c,true);
}
/* try superinterfaces recursively */
for (i = 0; i < c->interfacescount; i++) {
- fi = class_resolvefield_int(c->interfaces[i], name, desc);
+ fi = class_resolvefield_int(c->interfaces[i].cls, name, desc);
if (fi)
return fi;
}
/* try superclass */
- if (c->super)
- return class_resolvefield_int(c->super, name, desc);
+ if (c->super.cls)
+ return class_resolvefield_int(c->super.cls, name, desc);
/* not found */
methodinfo *class_findmethod(classinfo *c, utf *name, utf *desc)
{
methodinfo *m;
- s4 i;
+ s4 i;
for (i = 0; i < c->methodscount; i++) {
m = &(c->methods[i]);
}
-/*********************** Function: class_fetchmethod **************************
-
- like class_findmethod, but aborts with an error if the method is not found
-
-*******************************************************************************/
-
-methodinfo *class_fetchmethod(classinfo *c, utf *name, utf *desc)
-{
- methodinfo *mi;
-
- mi = class_findmethod(c, name, desc);
-
- if (!mi) {
- log_plain("Class: "); if (c) log_plain_utf(c->name); log_nl();
- log_plain("Method: "); if (name) log_plain_utf(name); log_nl();
- log_plain("Descriptor: "); if (desc) log_plain_utf(desc); log_nl();
- panic("Method not found");
- }
-
- return mi;
-}
-
-
/************************* Function: class_findmethod_approx ******************
like class_findmethod but ignores the return value when comparing the
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 *desc_end = UTF_END(desc);
+ char *meth_end = UTF_END(meth_descr);
char ch;
/* compare argument types */
break; /* no match */
if (ch == ')')
- return &(c->methods[i]); /* all parameter types equal */
+ return &(c->methods[i]); /* all parameter types equal */
}
}
}
/* method found */
if (m) return m;
/* search superclass */
- c = c->super;
+ c = c->super.cls;
}
return NULL;
Searches a class and it's super classes for a method.
+ Superinterfaces are *not* searched.
+
*******************************************************************************/
methodinfo *class_resolvemethod(classinfo *c, utf *name, utf *desc)
if (m)
return m;
- c = c->super;
+ c = c->super.cls;
}
return NULL;
utf *name, utf *desc)
{
methodinfo *m;
- s4 i;
+ s4 i;
m = class_findmethod(c, name, desc);
/* try the superinterfaces */
for (i = 0; i < c->interfacescount; i++) {
- m = class_resolveinterfacemethod_intern(c->interfaces[i], name, desc);
+ m = class_resolveinterfacemethod_intern(c->interfaces[i].cls,
+ name, desc);
if (m)
return m;
return mi;
/* try class java.lang.Object */
+
mi = class_findmethod(class_java_lang_Object, name, desc);
if (mi)
/* class_resolveclassmethod ****************************************************
- Resolves a reference from REFERER to a method with NAME and DESC in
- class C.
+ 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.
+ If the method cannot be resolved the return value is NULL. If
+ EXCEPT is true *exceptionptr is set, too.
*******************************************************************************/
if (mi)
goto found;
- cls = cls->super;
+ cls = cls->super.cls;
}
/* try the superinterfaces */
for (i = 0; i < c->interfacescount; i++) {
- mi = class_resolveinterfacemethod_intern(c->interfaces[i], name, desc);
+ mi = class_resolveinterfacemethod_intern(c->interfaces[i].cls,
+ name, desc);
if (mi)
goto found;
for (;;) {
if (!sub) return false;
if (sub == super) return true;
- sub = sub->super;
- }
-}
-
-
-/****************** Initialization function for classes ******************
-
- In Java, every class can have a static initialization function. This
- function has to be called BEFORE calling other methods or accessing static
- variables.
-
-*******************************************************************************/
-
-static classinfo *class_init_intern(classinfo *c);
-
-classinfo *class_init(classinfo *c)
-{
- classinfo *r;
-
- if (!makeinitializations)
- return c;
-
-#if defined(USE_THREADS)
- /* enter a monitor on the class */
-
- builtin_monitorenter((java_objectheader *) c);
-#endif
-
- /* maybe the class is already initalized or the current thread, which can
- pass the monitor, is currently initalizing this class */
-
- /* JOWENN: In future we need an additinal flag: initializationfailed,
- since further access to the class should cause a NoClassDefFound,
- if the static initializer failed once
- */
-
- if (c->initialized || c->initializing) {
-#if defined(USE_THREADS)
- builtin_monitorexit((java_objectheader *) c);
-#endif
-
- return c;
- }
-
- /* this initalizing run begins NOW */
- c->initializing = true;
-
- /* call the internal function */
- r = class_init_intern(c);
-
- /* if return value is not NULL everything was ok and the class is
- initialized */
- if (r)
- c->initialized = true;
-
- /* this initalizing run is done */
- c->initializing = false;
-
-#if defined(USE_THREADS)
- /* leave the monitor */
-
- builtin_monitorexit((java_objectheader *) c);
-#endif
-
- return r;
-}
-
-
-/* this function MUST NOT be called directly, because of thread <clinit>
- race conditions */
-
-static classinfo *class_init_intern(classinfo *c)
-{
- methodinfo *m;
- s4 i;
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
- int b;
-#endif
-
- /* maybe the class is not already loaded */
- if (!c->loaded)
- if (!load_class_bootstrap(c))
- return NULL;
-
- /* maybe the class is not already linked */
- if (!c->linked)
- if (!link_class(c))
- return NULL;
-
-#if defined(STATISTICS)
- if (opt_stat)
- count_class_inits++;
-#endif
-
- /* initialize super class */
-
- if (c->super) {
- if (!c->super->initialized) {
- if (initverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Initialize super class ");
- utf_sprint_classname(logtext + strlen(logtext), c->super->name);
- sprintf(logtext + strlen(logtext), " from ");
- utf_sprint_classname(logtext + strlen(logtext), c->name);
- log_text(logtext);
- }
-
- if (!class_init(c->super))
- return NULL;
- }
- }
-
- /* initialize interface classes */
-
- for (i = 0; i < c->interfacescount; i++) {
- if (!c->interfaces[i]->initialized) {
- if (initverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Initialize interface class ");
- utf_sprint_classname(logtext + strlen(logtext), c->interfaces[i]->name);
- sprintf(logtext + strlen(logtext), " from ");
- utf_sprint_classname(logtext + strlen(logtext), c->name);
- log_text(logtext);
- }
-
- if (!class_init(c->interfaces[i]))
- return NULL;
- }
- }
-
- m = class_findmethod(c, utf_clinit, utf_void__void);
-
- if (!m) {
- if (initverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Class ");
- utf_sprint_classname(logtext + strlen(logtext), c->name);
- sprintf(logtext + strlen(logtext), " has no static class initializer");
- log_text(logtext);
- }
-
- return c;
+ sub = sub->super.cls;
}
-
- /* Sun's and IBM's JVM don't care about the static flag */
-/* if (!(m->flags & ACC_STATIC)) { */
-/* panic("Class initializer is not static!"); */
-
- if (initverbose)
- log_message_class("Starting static class initializer for class: ", c);
-
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
- b = blockInts;
- blockInts = 0;
-#endif
-
- /* now call the initializer */
- asm_calljavafunction(m, NULL, NULL, NULL, NULL);
-
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
- assert(blockInts == 0);
- blockInts = b;
-#endif
-
- /* we have an exception or error */
- if (*exceptionptr) {
- /* class is NOT initialized */
- c->initialized = false;
-
- /* is this an exception, than wrap it */
- if (builtin_instanceof(*exceptionptr, class_java_lang_Exception)) {
- java_objectheader *xptr;
- java_objectheader *cause;
-
- /* get the cause */
- cause = *exceptionptr;
-
- /* clear exception, because we are calling jit code again */
- *exceptionptr = NULL;
-
- /* wrap the exception */
- xptr =
- new_exception_throwable(string_java_lang_ExceptionInInitializerError,
- (java_lang_Throwable *) cause);
-
- /* XXX should we exit here? */
- if (*exceptionptr)
- throw_exception();
-
- /* set new exception */
- *exceptionptr = xptr;
- }
-
- return NULL;
- }
-
- if (initverbose)
- log_message_class("Finished static class initializer for class: ", c);
-
- return c;
}
switch (c->cptags [i]) {
case CONSTANT_Class:
printf("Classreference -> ");
- utf_display(((classinfo*)e)->name);
+ utf_display(((constant_classref*)e)->name);
break;
case CONSTANT_Fieldref:
displayFMIi:
{
constant_FMIref *fmi = e;
- utf_display(fmi->class->name);
+ utf_display(fmi->classref->name);
printf(".");
utf_display(fmi->name);
printf(" ");
utf_display(e);
break;
default:
- panic("Invalid type of ConstantPool-Entry");
+ log_text("Invalid type of ConstantPool-Entry");
+ assert(0);
}
}
printf("\n");
switch (c -> cptags [i]) {
case CONSTANT_Class:
printf ("Classreference -> ");
- utf_display ( ((classinfo*)e) -> name );
+ utf_display ( ((constant_classref*)e) -> name );
break;
case CONSTANT_Fieldref:
displayFMI:
{
constant_FMIref *fmi = e;
- utf_display ( fmi->class->name );
+ utf_display ( fmi->classref->name );
printf (".");
utf_display ( fmi->name);
printf (" ");
utf_display (e);
break;
default:
- panic ("Invalid type of ConstantPool-Entry");
+ log_text("Invalid type of ConstantPool-Entry");
+ assert(0);
}
}
printf ("Flags: "); printflags (c->flags); printf ("\n");
printf ("This: "); utf_display (c->name); printf ("\n");
- if (c->super) {
- printf ("Super: "); utf_display (c->super->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] -> name);
- printf (" (%d)\n", c->interfaces[i] -> index);
+ utf_display (c -> interfaces[i].cls -> name);
+ printf (" (%d)\n", c->interfaces[i].cls -> index);
}
printf ("fields:\n");
}
-/******************************************************************************/
-/******************* General functions for the class loader *******************/
-/******************************************************************************/
+/* loader_close ****************************************************************
-/******************** Function: loader_close ***********************************
-
- Frees all resources
+ Frees all resources.
*******************************************************************************/
-void loader_close()
+void loader_close(void)
{
- classinfo *c;
- s4 slot;
-
- for (slot = 0; slot < class_hash.size; slot++) {
- c = class_hash.ptr[slot];
-
- while (c) {
- class_free(c);
- c = c->hashlink;
- }
- }
+ /* empty */
}
projects / cacao.git / blobdiff