-/* loader.c - class loader functions
+/* src/vm/loader.c - class loader functions
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
- M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
- P. Tomsich, J. Wenninger
+ 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
This file is part of CACAO.
Contact: cacao@complang.tuwien.ac.at
Authors: Reinhard Grafl
+
Changes: Andreas Krall
Roman Obermaiser
Mark Probst
- Edwin Steiner
+ Edwin Steiner
+ Christian Thalinger
- $Id: loader.c 1031 2004-04-26 16:06:03Z twisti $
+ $Id: loader.c 2189 2005-04-02 02:05:59Z edwin $
*/
#include <string.h>
#include <assert.h>
#include <sys/stat.h>
-#include "global.h"
-#include "loader.h"
-#include "main.h"
-#include "native.h"
-#include "tables.h"
-#include "builtin.h"
-#include "jit.h"
-#include "asmpart.h"
-#include "toolbox/memory.h"
-#include "toolbox/loging.h"
-#include "threads/thread.h"
-#include "threads/locks.h"
-#include "nat/java_lang_Throwable.h"
-
-#ifdef USE_ZLIB
-#include "unzip.h"
+
+#include "config.h"
+#include "mm/memory.h"
+#include "native/native.h"
+#include "native/include/java_lang_Throwable.h"
+
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+# include "threads/native/threads.h"
+# else
+# include "threads/green/threads.h"
+# include "threads/green/locks.h"
+# endif
+#endif
+
+#include "toolbox/logging.h"
+#include "toolbox/util.h"
+#include "vm/exceptions.h"
+#include "vm/builtin.h"
+#include "vm/global.h"
+#include "vm/linker.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/statistics.h"
+#include "vm/stringlocal.h"
+#include "vm/tables.h"
+
+#if defined(USE_ZLIB)
+# include "vm/unzip.h"
#endif
+#include "vm/jit/asmpart.h"
+#include "vm/jit/codegen.inc.h"
+
+
#undef JOWENN_DEBUG
#undef JOWENN_DEBUG1
#undef JOWENN_DEBUG2
-/* global variables ***********************************************************/
-int count_class_infos = 0; /* variables for measurements */
-int count_const_pool_len = 0;
-int count_vftbl_len = 0;
-int count_all_methods = 0;
-int count_vmcode_len = 0;
-int count_extable_len = 0;
-int count_class_loads = 0;
-int count_class_inits = 0;
+/********************************************************************
+ list of classpath entries (either filesystem directories or
+ ZIP/JAR archives
+********************************************************************/
+
+classpath_info *classpath_entries = NULL;
+
+/* loader_init *****************************************************************
-static s4 interfaceindex; /* sequential numbering of interfaces */
-static s4 classvalue;
+ Initializes all lists and loads all classes required for the system
+ or the compiler.
+*******************************************************************************/
+
+bool loader_init(u1 *stackbottom)
+{
+ classpath_info *cpi;
-/* utf-symbols for pointer comparison of frequently used strings */
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ /* Initialize the monitor pointer for zip/jar file locking. */
-static utf *utf_innerclasses; /* InnerClasses */
-static utf *utf_constantvalue; /* ConstantValue */
-static utf *utf_code; /* Code */
-static utf *utf_exceptions; /* Exceptions */
-static utf *utf_linenumbertable; /* LineNumberTable */
-static utf *utf_sourcefile; /*SourceFile*/
-static utf *utf_finalize; /* finalize */
-static utf *utf_fidesc; /* ()V changed */
-static utf *utf_init; /* <init> */
-static utf *utf_clinit; /* <clinit> */
-static utf *utf_initsystemclass; /* initializeSystemClass */
-static utf *utf_systemclass; /* java/lang/System */
-static utf *utf_vmclassloader; /* java/lang/VMClassLoader */
-static utf *utf_vmclass; /* java/lang/VMClassLoader */
-static utf *utf_initialize;
-static utf *utf_initializedesc;
-static utf *utf_java_lang_Object; /* java/lang/Object */
+ for (cpi = classpath_entries; cpi != NULL; cpi = cpi->next) {
+ if (cpi->type == CLASSPATH_ARCHIVE)
+ initObjectLock(&cpi->header);
+ }
+#endif
+ /* load some important classes */
+ if (!load_class_bootstrap(class_java_lang_Object))
+ return false;
+ if (!load_class_bootstrap(class_java_lang_String))
+ return false;
-utf* clinit_desc(){
- return utf_fidesc;
-}
-utf* clinit_name(){
- return utf_clinit;
-}
+ if (!load_class_bootstrap(class_java_lang_Cloneable))
+ return false;
+ if (!load_class_bootstrap(class_java_io_Serializable))
+ return false;
-/* important system classes ***************************************************/
-classinfo *class_java_lang_Object;
-classinfo *class_java_lang_String;
+ /* load classes for wrapping primitive types */
-classinfo *class_java_lang_Throwable;
-classinfo *class_java_lang_Cloneable;
-classinfo *class_java_io_Serializable;
+ if (!load_class_bootstrap(class_java_lang_Void))
+ return false;
-/* Pseudo classes for the typechecker */
-classinfo *pseudo_class_Arraystub = NULL;
-classinfo *pseudo_class_Null = NULL;
-classinfo *pseudo_class_New = NULL;
-vftbl *pseudo_class_Arraystub_vftbl = NULL;
+ if (!load_class_bootstrap(class_java_lang_Boolean))
+ return false;
-utf *array_packagename = NULL;
+ if (!load_class_bootstrap(class_java_lang_Byte))
+ return false;
+ if (!load_class_bootstrap(class_java_lang_Character))
+ return false;
-/********************************************************************
- list of classpath entries (either filesystem directories or
- ZIP/JAR archives
-********************************************************************/
-static classpath_info *classpath_entries=0;
+ if (!load_class_bootstrap(class_java_lang_Short))
+ return false;
+ if (!load_class_bootstrap(class_java_lang_Integer))
+ return false;
-/******************************************************************************
+ if (!load_class_bootstrap(class_java_lang_Long))
+ return false;
- structure for primitive classes: contains the class for wrapping the
- primitive type, the primitive class, the name of the class for wrapping,
- the one character type signature and the name of the primitive class
-
- ******************************************************************************/
+ if (!load_class_bootstrap(class_java_lang_Float))
+ return false;
-/* CAUTION: Don't change the order of the types. This table is indexed
- * by the ARRAYTYPE_ constants (expcept ARRAYTYPE_OBJECT).
- */
-primitivetypeinfo primitivetype_table[PRIMITIVETYPE_COUNT] = {
- { NULL, NULL, "java/lang/Integer", 'I', "int" , "[I", NULL, NULL },
- { NULL, NULL, "java/lang/Long", 'J', "long" , "[J", NULL, NULL },
- { NULL, NULL, "java/lang/Float", 'F', "float" , "[F", NULL, NULL },
- { NULL, NULL, "java/lang/Double", 'D', "double" , "[D", NULL, NULL },
- { NULL, NULL, "java/lang/Byte", 'B', "byte" , "[B", NULL, NULL },
- { NULL, NULL, "java/lang/Character", 'C', "char" , "[C", NULL, NULL },
- { NULL, NULL, "java/lang/Short", 'S', "short" , "[S", NULL, NULL },
- { NULL, NULL, "java/lang/Boolean", 'Z', "boolean" , "[Z", NULL, NULL },
- { NULL, NULL, "java/lang/Void", 'V', "void" , NULL, NULL, NULL }
-};
+ if (!load_class_bootstrap(class_java_lang_Double))
+ return false;
-/* instances of important system classes **************************************/
+#if defined(USE_THREADS)
+ if (stackbottom != 0)
+ initLocks();
+#endif
-java_objectheader *proto_java_lang_NullPointerException;
+ return true;
+}
/************* functions for reading classdata *********************************
*******************************************************************************/
-static char *classpath = ""; /* searchpath for classfiles */
+/* check_classbuffer_size ******************************************************
+
+ assert that at least <len> bytes are left to read
+ <len> is limited to the range of non-negative s4 values
+
+*******************************************************************************/
+
+inline bool check_classbuffer_size(classbuffer *cb, s4 len)
+{
+ if (len < 0 || ((cb->data + cb->size) - cb->pos - 1) < len) {
+ *exceptionptr =
+ new_classformaterror((cb)->class, "Truncated class file");
+
+ return false;
+ }
+
+ return true;
+}
+
+/* suck_nbytes *****************************************************************
-/* assert that at least <len> bytes are left to read */
-/* <len> is limited to the range of non-negative s4 values */
+ transfer block of classfile data into a buffer
-#define ASSERT_LEFT(cb, len) \
- do { \
- if (((s4) (len)) < 0 || \
- (((cb)->data + (cb)->size) - (cb)->pos - 1) < (len)) { \
- char message[MAXLOGTEXT]; \
- utf_sprint_classname(message, (cb)->class->name); \
- sprintf(message + strlen(message), " (Truncated class file)"); \
- *exceptionptr = \
- new_exception_message(string_java_lang_ClassFormatError, \
- message); \
- throw_exception_exit(); \
- } \
- } while (0)
+*******************************************************************************/
+inline void suck_nbytes(u1 *buffer, classbuffer *cb, s4 len)
+{
+ memcpy(buffer, cb->pos + 1, len);
+ cb->pos += len;
+}
-/* transfer block of classfile data into a buffer */
-#define suck_nbytes(buffer, cb, len) \
- do { \
- ASSERT_LEFT((cb), (len)); \
- memcpy((buffer), (cb)->pos + 1, (len)); \
- (cb)->pos += (len); \
- } while (0)
+/* skip_nbytes ****************************************************************
+ skip block of classfile data
-/* skip block of classfile data */
+*******************************************************************************/
-#define skip_nbytes(cb, len) \
- do { \
- ASSERT_LEFT((cb), (len)); \
- (cb)->pos += (len); \
- } while (0)
+inline void skip_nbytes(classbuffer *cb, s4 len)
+{
+ cb->pos += len;
+}
inline u1 suck_u1(classbuffer *cb)
{
- ASSERT_LEFT(cb, 1);
return *++(cb->pos);
}
return ((u4) a << 24) + ((u4) b << 16) + ((u4) c << 8) + (u4) d;
}
-#define suck_s8(a) (s8) suck_u8((a))
-#define suck_s2(a) (s2) suck_u2((a))
-#define suck_s4(a) (s4) suck_u4((a))
-#define suck_s1(a) (s1) suck_u1((a))
-
/* get u8 from classfile data */
static u8 suck_u8(classbuffer *cb)
buffer[3 - i] = suck_u1(cb);
memcpy((u1*) (&f), buffer, 4);
-#else
+#else
suck_nbytes((u1*) (&f), cb, 4);
#endif
- PANICIF (sizeof(float) != 4, "Incompatible float-format");
+ if (sizeof(float) != 4) {
+ *exceptionptr = new_exception_message(string_java_lang_InternalError,
+ "Incompatible float-format");
+
+ /* XXX should we exit in such a case? */
+ throw_exception_exit();
+ }
return f;
}
suck_nbytes((u1*) (&d), cb, 8);
#endif
- PANICIF (sizeof(double) != 8, "Incompatible double-format" );
+ if (sizeof(double) != 8) {
+ *exceptionptr = new_exception_message(string_java_lang_InternalError,
+ "Incompatible double-format");
+
+ /* XXX should we exit in such a case? */
+ throw_exception_exit();
+ }
return d;
}
*******************************************************************************/
-void suck_init(char *cpath)
+void suck_init(char *classpath)
{
- char *filename=0;
- char *start;
- char *end;
- int isZip;
- int filenamelen;
- union classpath_info *tmp;
- union classpath_info *insertAfter=0;
-
- if (!cpath)
- return;
-
- classpath = cpath;
-
- if (classpath_entries)
- panic("suck_init should be called only once");
+ char *start;
+ char *end;
+ char *filename;
+ s4 filenamelen;
+ bool is_zip;
+ classpath_info *cpi;
+ classpath_info *lastcpi;
+ char *cwd;
+ s4 cwdlen;
+
+ /* search for last classpath entry (only if there already some) */
+
+ if ((lastcpi = classpath_entries)) {
+ while (lastcpi->next)
+ lastcpi = lastcpi->next;
+ }
for (start = classpath; (*start) != '\0';) {
+
+ /* search for ':' delimiter to get the end of the current entry */
for (end = start; ((*end) != '\0') && ((*end) != ':'); end++);
if (start != end) {
- isZip = 0;
+ is_zip = false;
filenamelen = end - start;
- if (filenamelen>3) {
+ if (filenamelen > 3) {
if (strncasecmp(end - 3, "zip", 3) == 0 ||
strncasecmp(end - 3, "jar", 3) == 0) {
- isZip = 1;
+ is_zip = true;
}
}
- if (filenamelen >= (CLASSPATH_MAXFILENAME - 1))
- panic("path length >= MAXFILENAME in suck_init");
+ /* save classpath entries as absolute pathnames */
+
+ cwd = NULL;
+ cwdlen = 0;
+
+ if (*start != '/') { /* XXX fix me for win32 */
+ cwd = _Jv_getcwd();
+ cwdlen = strlen(cwd) + strlen("/");
+ }
+
+ /* allocate memory for filename and fill it */
- if (!filename)
- filename = MNEW(char*, CLASSPATH_MAXFILENAME);
+ filename = MNEW(char, filenamelen + cwdlen + strlen("/") +
+ strlen("0"));
- strncpy(filename, start, filenamelen);
- filename[filenamelen + 1] = '\0';
- tmp = 0;
+ if (cwd) {
+ strcpy(filename, cwd);
+ strcat(filename, "/");
+ strncat(filename, start, filenamelen);
- if (isZip) {
-#ifdef USE_ZLIB
+ /* add cwd length to file length */
+ filenamelen += cwdlen;
+
+ } else {
+ strncpy(filename, start, filenamelen);
+ filename[filenamelen] = '\0';
+ }
+
+ cpi = NULL;
+
+ if (is_zip) {
+#if defined(USE_ZLIB)
unzFile uf = unzOpen(filename);
if (uf) {
- tmp = (union classpath_info *) NEW(classpath_info);
- tmp->archive.type = CLASSPATH_ARCHIVE;
- tmp->archive.uf = uf;
- tmp->archive.next = 0;
- filename = 0;
+ cpi = NEW(classpath_info);
+ cpi->type = CLASSPATH_ARCHIVE;
+ cpi->uf = uf;
+ cpi->next = NULL;
+ cpi->path = filename;
+ cpi->pathlen = filenamelen;
}
+
#else
- panic("Zip/JAR not supported");
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "zip/jar files not supported");
#endif
} else {
- tmp = (union classpath_info *) NEW(classpath_info);
- tmp->filepath.type = CLASSPATH_PATH;
- tmp->filepath.next = 0;
+ cpi = NEW(classpath_info);
+ cpi->type = CLASSPATH_PATH;
+ cpi->next = NULL;
if (filename[filenamelen - 1] != '/') {/*PERHAPS THIS SHOULD BE READ FROM A GLOBAL CONFIGURATION */
filename[filenamelen] = '/';
filename[filenamelen + 1] = '\0';
filenamelen++;
}
-
- tmp->filepath.filename = filename;
- tmp->filepath.pathlen = filenamelen;
- filename = 0;
+
+ cpi->path = filename;
+ cpi->pathlen = filenamelen;
}
- if (tmp) {
- if (insertAfter) {
- insertAfter->filepath.next = tmp;
+ /* attach current classpath entry */
- } else {
- classpath_entries = tmp;
- }
- insertAfter = tmp;
+ if (cpi) {
+ if (!classpath_entries)
+ classpath_entries = cpi;
+ else
+ lastcpi->next = cpi;
+
+ lastcpi = cpi;
}
}
- if ((*end) == ':')
+ /* goto next classpath entry, skip ':' delimiter */
+
+ if ((*end) == ':') {
start = end + 1;
- else
+
+ } else {
start = end;
-
- if (filename)
- MFREE(filename, char*, CLASSPATH_MAXFILENAME);
+ }
}
}
void create_all_classes()
{
classpath_info *cpi;
- unz_file_info file_info;
- for (cpi = classpath_entries; cpi != 0; cpi = cpi->filepath.next) {
+ for (cpi = classpath_entries; cpi != 0; cpi = cpi->next) {
#if defined(USE_ZLIB)
- if (cpi->filepath.type == CLASSPATH_ARCHIVE) {
+ if (cpi->type == CLASSPATH_ARCHIVE) {
cacao_entry_s *ce;
unz_s *s;
- s = (unz_s *) cpi->archive.uf;
+ s = (unz_s *) cpi->uf;
ce = s->cacao_dir_list;
while (ce) {
}
-/************************** function suck_start ********************************
+/* suck_start ******************************************************************
- returns true if classbuffer is already loaded or a file for the
- specified class has succussfully been read in. All directories of
- the searchpath are used to find the classfile (<classname>.class).
- Returns false if no classfile is found and writes an error message.
+ Returns true if classbuffer is already loaded or a file for the
+ specified class has succussfully been read in. All directories of
+ the searchpath are used to find the classfile (<classname>.class).
+ Returns false if no classfile is found and writes an error message.
*******************************************************************************/
classbuffer *suck_start(classinfo *c)
{
- classpath_info *currPos;
- char *utf_ptr;
- char ch;
- char filename[CLASSPATH_MAXFILENAME+10]; /* room for '.class' */
- int filenamelen=0;
+ classpath_info *cpi;
+ char *filename;
+ s4 filenamelen;
+ char *path;
FILE *classfile;
- int err;
+ bool found;
+ s4 len;
struct stat buffer;
classbuffer *cb;
- utf_ptr = c->name->text;
+ /* initialize return value */
- while (utf_ptr < utf_end(c->name)) {
- PANICIF (filenamelen >= CLASSPATH_MAXFILENAME, "Filename too long");
- ch = *utf_ptr++;
- if ((ch <= ' ' || ch > 'z') && (ch != '/')) /* invalid character */
- ch = '?';
- filename[filenamelen++] = ch;
- }
+ found = false;
+ cb = NULL;
+
+ filenamelen = utf_strlen(c->name) + strlen(".class") + strlen("0");
+ filename = MNEW(char, filenamelen);
+
+ utf_sprint(filename, c->name);
+ strcat(filename, ".class");
+
+ /* walk through all classpath entries */
+
+ for (cpi = classpath_entries; cpi != NULL && cb == NULL; cpi = cpi->next) {
+#if defined(USE_ZLIB)
+ if (cpi->type == CLASSPATH_ARCHIVE) {
- strcpy(filename + filenamelen, ".class");
- filenamelen += 6;
+#if defined(USE_THREADS)
+ /* enter a monitor on zip/jar archives */
+
+ builtin_monitorenter((java_objectheader *) cpi);
+#endif
- for (currPos = classpath_entries; currPos != 0; currPos = currPos->filepath.next) {
-#ifdef USE_ZLIB
- if (currPos->filepath.type == CLASSPATH_ARCHIVE) {
- if (cacao_locate(currPos->archive.uf, c->name) == UNZ_OK) {
+ if (cacao_locate(cpi->uf, c->name) == UNZ_OK) {
unz_file_info file_info;
- /*log_text("Class found in zip file");*/
- if (unzGetCurrentFileInfo(currPos->archive.uf, &file_info, filename,
- sizeof(filename), NULL, 0, NULL, 0) == UNZ_OK) {
- if (unzOpenCurrentFile(currPos->archive.uf) == UNZ_OK) {
+
+ if (unzGetCurrentFileInfo(cpi->uf, &file_info, filename,
+ sizeof(filename), NULL, 0, NULL, 0) == UNZ_OK) {
+ 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;
- /*printf("classfile size: %d\n",file_info.uncompressed_size);*/
- if (unzReadCurrentFile(currPos->archive.uf, cb->data, cb->size) == cb->size) {
- unzCloseCurrentFile(currPos->archive.uf);
- return cb;
- } else {
- MFREE(cb->data, u1, cb->size);
-FREE(cb, classbuffer);
+ len = unzReadCurrentFile(cpi->uf, cb->data, cb->size);
+
+ if (len != cb->size) {
+ suck_stop(cb);
log_text("Error while unzipping");
+
+ } else {
+ found = true;
}
- } else log_text("Error while opening file in archive");
- } else log_text("Error while retrieving fileinfo");
+
+ } else {
+ log_text("Error while opening file in archive");
+ }
+
+ } else {
+ log_text("Error while retrieving fileinfo");
+ }
}
- unzCloseCurrentFile(currPos->archive.uf);
+ unzCloseCurrentFile(cpi->uf);
- } else {
-#endif
- if ((currPos->filepath.pathlen + filenamelen) >= CLASSPATH_MAXFILENAME) continue;
- strcpy(currPos->filepath.filename + currPos->filepath.pathlen, filename);
- classfile = fopen(currPos->filepath.filename, "r");
- if (classfile) { /* file exists */
+#if defined(USE_THREADS)
+ /* leave the monitor */
- /* determine size of classfile */
+ builtin_monitorexit((java_objectheader *) cpi);
+#endif
- /* dolog("File: %s",filename); */
+ } else {
+#endif /* defined(USE_ZLIB) */
+
+ path = MNEW(char, cpi->pathlen + filenamelen);
+ strcpy(path, cpi->path);
+ strcat(path, filename);
- err = stat(currPos->filepath.filename, &buffer);
+ classfile = fopen(path, "r");
- if (!err) { /* read classfile data */
+ if (classfile) { /* file exists */
+ 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;
- fread(cb->data, 1, cb->size, classfile);
- fclose(classfile);
- return cb;
+
+ /* read class data */
+ len = fread(cb->data, 1, cb->size, classfile);
+
+ if (len != buffer.st_size) {
+ suck_stop(cb);
+/* if (ferror(classfile)) { */
+/* } */
+
+ } else {
+ found = true;
+ }
}
}
-#ifdef USE_ZLIB
+
+ MFREE(path, char, cpi->pathlen + filenamelen);
+#if defined(USE_ZLIB)
}
#endif
}
- if (verbose) {
- dolog("Warning: Can not open class file '%s'", filename);
- }
+ if (opt_verbose)
+ if (!found)
+ dolog("Warning: Can not open class file '%s'", filename);
- return NULL;
+ 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: skipattribute *****************************
-
- skips a (1) 'attribute' structure in the class file
+/********************** Function: skipattributebody ****************************
+ skips an attribute after the 16 bit reference to attribute_name has already
+ been read
+
*******************************************************************************/
-static void skipattribute(classbuffer *cb)
+static bool skipattributebody(classbuffer *cb)
{
u4 len;
- suck_u2(cb);
+
+ if (!check_classbuffer_size(cb, 4))
+ return false;
+
len = suck_u4(cb);
+
+ if (!check_classbuffer_size(cb, len))
+ return false;
+
skip_nbytes(cb, len);
+
+ return true;
}
-/********************** Function: skipattributebody ****************************
+/************************* Function: skipattributes ****************************
- skips an attribute after the 16 bit reference to attribute_name has already
- been read
+ skips num attribute structures
*******************************************************************************/
-static void skipattributebody(classbuffer *cb)
+static bool skipattributes(classbuffer *cb, u4 num)
{
+ u4 i;
u4 len;
- len = suck_u4(cb);
- skip_nbytes(cb, len);
+
+ for (i = 0; i < num; i++) {
+ if (!check_classbuffer_size(cb, 2 + 4))
+ return false;
+
+ suck_u2(cb);
+ len = suck_u4(cb);
+
+ if (!check_classbuffer_size(cb, len))
+ return false;
+
+ skip_nbytes(cb, len);
+ }
+
+ return true;
}
-/************************* Function: skipattributes ****************************
+/******************** 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
- skips num attribute structures
-
*******************************************************************************/
-static void skipattributes(classbuffer *cb, u4 num)
+voidptr class_getconstant(classinfo *c, u4 pos, u4 ctype)
{
- u4 i;
- for (i = 0; i < num; i++)
- skipattribute(cb);
+ /* 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];
}
*******************************************************************************/
-voidptr innerclass_getconstant(classinfo *c, u4 pos, u4 ctype)
+voidptr innerclass_getconstant(classinfo *c, u4 pos, u4 ctype)
{
/* invalid position in constantpool */
- if (pos >= c->cpcount)
- panic("Attempt to access constant outside range");
+ if (pos >= c->cpcount) {
+ *exceptionptr = new_classformaterror(c, "Illegal constant pool index");
+ return NULL;
+ }
/* constantpool entry of type 0 */
if (!c->cptags[pos])
/* check type of constantpool entry */
if (c->cptags[pos] != ctype) {
- error("Type mismatch on constant: %d requested, %d here (innerclass_getconstant)",
- (int) ctype, (int) c->cptags[pos] );
+ *exceptionptr = new_classformaterror(c, "Illegal constant pool index");
+ return NULL;
}
return c->cpinfos[pos];
}
-/************************ function: attribute_load ****************************
+/********************* Function: class_constanttype ****************************
- read attributes from classfile
+ Determines the type of a class entry in the ConstantPool
*******************************************************************************/
-static void attribute_load(classbuffer *cb, classinfo *c, u4 num)
+u4 class_constanttype(classinfo *c, u4 pos)
{
- u4 i, j;
-
- for (i = 0; i < num; i++) {
- /* retrieve attribute name */
- utf *aname = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
-
- if (aname == utf_innerclasses) {
- /* innerclasses attribute */
-
- if (c->innerclass != NULL)
- panic("Class has more than one InnerClasses attribute");
-
- /* skip attribute length */
- suck_u4(cb);
- /* number of records */
- c->innerclasscount = suck_u2(cb);
- /* allocate memory for innerclass structure */
- c->innerclass = MNEW(innerclassinfo, c->innerclasscount);
-
- for (j = 0; j < c->innerclasscount; j++) {
- /* The innerclass structure contains a class with an encoded name,
- its defining scope, its simple name and a bitmask of the access flags.
- If an inner class is not a member, its outer_class is NULL,
- if a class is anonymous, its name is NULL. */
-
- innerclassinfo *info = c->innerclass + j;
-
- info->inner_class = innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class); /* CONSTANT_Class_info index */
- info->outer_class = innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class); /* CONSTANT_Class_info index */
- info->name = innerclass_getconstant(c, suck_u2(cb), CONSTANT_Utf8); /* CONSTANT_Utf8_info index */
- info->flags = suck_u2(cb); /* access_flags bitmask */
- }
- } else if (aname==utf_sourcefile) {
- suck_u4(cb);
- /*log_text("source file attribute found");*/
- c->sourcefile = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
- } else {
- /* unknown attribute */
- skipattributebody(cb);
- }
+ if (pos <= 0 || pos >= c->cpcount) {
+ *exceptionptr = new_classformaterror(c, "Illegal constant pool index");
+ return 0;
}
-}
-
-
-/******************* function: checkfielddescriptor ****************************
- checks whether a field-descriptor is valid and aborts otherwise
- all referenced classes are inserted into the list of unloaded classes
-
-*******************************************************************************/
-
-static void checkfielddescriptor (char *utf_ptr, char *end_pos)
-{
- class_from_descriptor(utf_ptr,end_pos,NULL,
- CLASSLOAD_NEW
- | CLASSLOAD_NULLPRIMITIVE
- | CLASSLOAD_NOVOID
- | CLASSLOAD_CHECKEND);
-
- /* XXX use the following if -noverify */
-#if 0
- char *tstart; /* pointer to start of classname */
- char ch;
- char *start = utf_ptr;
-
- switch (*utf_ptr++) {
- case 'B':
- case 'C':
- case 'I':
- case 'S':
- case 'Z':
- case 'J':
- case 'F':
- case 'D':
- /* primitive type */
- break;
-
- case '[':
- case 'L':
- if (!class_from_descriptor(start,end_pos,&utf_ptr,CLASSLOAD_NEW))
- panic ("Ill formed descriptor");
- break;
-
- default:
- panic ("Ill formed descriptor");
- }
-
- /* exceeding characters */
- if (utf_ptr!=end_pos) panic ("descriptor has exceeding chars");
-#endif
+ return c->cptags[pos];
}
-/******************* function checkmethoddescriptor ****************************
+/* load_constantpool ***********************************************************
- checks whether a method-descriptor is valid and aborts otherwise.
- All referenced classes are inserted into the list of unloaded classes.
+ Loads the constantpool of a class, the entries are transformed into
+ a simpler format by resolving references (a detailed overview of
+ the compact structures can be found in global.h).
- The number of arguments is returned. A long or double argument is counted
- as two arguments.
-
*******************************************************************************/
-static int checkmethoddescriptor (utf *d)
+static bool load_constantpool(classbuffer *cb,descriptor_pool *descpool)
{
- char *utf_ptr = d->text; /* current position in utf text */
- char *end_pos = utf_end(d); /* points behind utf string */
- int argcount = 0; /* number of arguments */
- /* method descriptor must start with parenthesis */
- if (utf_ptr == end_pos || *utf_ptr++ != '(') panic ("Missing '(' in method descriptor");
+ /* The following structures are used to save information which cannot be
+ processed during the first pass. After the complete constantpool has
+ been traversed the references can be resolved.
+ (only in specific order) */
+
+ /* CONSTANT_Class entries */
+ typedef struct forward_class {
+ struct forward_class *next;
+ u2 thisindex;
+ u2 name_index;
+ } forward_class;
- /* check arguments */
- while (utf_ptr != end_pos && *utf_ptr != ')') {
- /* We cannot count the this argument here because
- * we don't know if the method is static. */
- if (*utf_ptr == 'J' || *utf_ptr == 'D')
- argcount+=2;
- else
- argcount++;
- class_from_descriptor(utf_ptr,end_pos,&utf_ptr,
- CLASSLOAD_NEW
- | CLASSLOAD_NULLPRIMITIVE
- | CLASSLOAD_NOVOID);
- }
+ /* CONSTANT_String */
+ typedef struct forward_string {
+ struct forward_string *next;
+ u2 thisindex;
+ u2 string_index;
+ } forward_string;
- if (utf_ptr == end_pos) panic("Missing ')' in method descriptor");
- utf_ptr++; /* skip ')' */
+ /* CONSTANT_NameAndType */
+ typedef struct forward_nameandtype {
+ struct forward_nameandtype *next;
+ u2 thisindex;
+ u2 name_index;
+ u2 sig_index;
+ } forward_nameandtype;
- class_from_descriptor(utf_ptr,end_pos,NULL,
- CLASSLOAD_NEW
- | CLASSLOAD_NULLPRIMITIVE
- | CLASSLOAD_CHECKEND);
+ /* CONSTANT_Fieldref, CONSTANT_Methodref or CONSTANT_InterfaceMethodref */
+ typedef struct forward_fieldmethint {
+ struct forward_fieldmethint *next;
+ u2 thisindex;
+ u1 tag;
+ u2 class_index;
+ u2 nameandtype_index;
+ } forward_fieldmethint;
- if (argcount > 255)
- panic("Invalid method descriptor: too many arguments");
- return argcount;
+ classinfo *c;
+ u4 idx;
- /* XXX use the following if -noverify */
-#if 0
- /* check arguments */
- while ((c = *utf_ptr++) != ')') {
- start = utf_ptr-1;
-
- switch (c) {
- case 'B':
- case 'C':
- case 'I':
- case 'S':
- case 'Z':
- case 'J':
- case 'F':
- case 'D':
- /* primitive type */
- break;
+ forward_class *forward_classes = NULL;
+ forward_string *forward_strings = NULL;
+ forward_nameandtype *forward_nameandtypes = NULL;
+ forward_fieldmethint *forward_fieldmethints = NULL;
- case '[':
- case 'L':
- if (!class_from_descriptor(start,end_pos,&utf_ptr,CLASSLOAD_NEW))
- panic ("Ill formed method descriptor");
- break;
-
- default:
- panic ("Ill formed methodtype-descriptor");
- }
- }
+ forward_class *nfc;
+ forward_string *nfs;
+ forward_nameandtype *nfn;
+ forward_fieldmethint *nff;
- /* check returntype */
- if (*utf_ptr=='V') {
- /* returntype void */
- if ((utf_ptr+1) != end_pos) panic ("Method-descriptor has exceeding chars");
- }
- else
- /* treat as field-descriptor */
- checkfielddescriptor (utf_ptr,end_pos);
-#endif
-}
+ u4 cpcount;
+ u1 *cptags;
+ voidptr *cpinfos;
+ c = cb->class;
-/***************** Function: print_arraydescriptor ****************************
+ /* number of entries in the constant_pool table plus one */
+ if (!check_classbuffer_size(cb, 2))
+ return false;
- Debugging helper for displaying an arraydescriptor
-
-*******************************************************************************/
+ cpcount = c->cpcount = suck_u2(cb);
-void print_arraydescriptor(FILE *file, arraydescriptor *desc)
-{
- if (!desc) {
- fprintf(file, "<NULL>");
- return;
- }
+ /* allocate memory */
+ cptags = c->cptags = MNEW(u1, cpcount);
+ cpinfos = c->cpinfos = MNEW(voidptr, cpcount);
- fprintf(file, "{");
- if (desc->componentvftbl) {
- if (desc->componentvftbl->class)
- utf_fprint(file, desc->componentvftbl->class->name);
- else
- fprintf(file, "<no classinfo>");
+ if (cpcount < 1) {
+ *exceptionptr = new_classformaterror(c, "Illegal constant pool size");
+ return false;
+ }
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_const_pool_len += (sizeof(voidptr) + 1) * cpcount;
+#endif
+
+ /* initialize constantpool */
+ for (idx = 0; idx < cpcount; idx++) {
+ cptags[idx] = CONSTANT_UNUSED;
+ cpinfos[idx] = NULL;
}
- else
- fprintf(file, "0");
-
- fprintf(file, ",");
- if (desc->elementvftbl) {
- if (desc->elementvftbl->class)
- utf_fprint(file, desc->elementvftbl->class->name);
- else
- fprintf(file, "<no classinfo>");
- }
- else
- fprintf(file, "0");
- fprintf(file, ",%d,%d,%d,%d}", desc->arraytype, desc->dimension,
- desc->dataoffset, desc->componentsize);
-}
+
+ /******* first pass *******/
+ /* entries which cannot be resolved now are written into
+ temporary structures and traversed again later */
+
+ idx = 1;
+ while (idx < cpcount) {
+ u4 t;
-/******************************************************************************/
-/************************** Functions for fields ****************************/
-/******************************************************************************/
+ /* get constant type */
+ if (!check_classbuffer_size(cb, 1))
+ return false;
+
+ t = suck_u1(cb);
+
+ switch (t) {
+ case CONSTANT_Class:
+ nfc = DNEW(forward_class);
+
+ nfc->next = forward_classes;
+ forward_classes = nfc;
+
+ nfc->thisindex = idx;
+ /* reference to CONSTANT_NameAndType */
+ if (!check_classbuffer_size(cb, 2))
+ return false;
+
+ nfc->name_index = suck_u2(cb);
+
+ idx++;
+ break;
+
+ case CONSTANT_String:
+ nfs = DNEW(forward_string);
+
+ nfs->next = forward_strings;
+ forward_strings = nfs;
+
+ nfs->thisindex = idx;
+
+ /* reference to CONSTANT_Utf8_info with string characters */
+ if (!check_classbuffer_size(cb, 2))
+ return false;
+
+ nfs->string_index = suck_u2(cb);
+
+ idx++;
+ break;
+
+ case CONSTANT_NameAndType:
+ nfn = DNEW(forward_nameandtype);
+
+ nfn->next = forward_nameandtypes;
+ forward_nameandtypes = nfn;
+
+ nfn->thisindex = idx;
+
+ if (!check_classbuffer_size(cb, 2 + 2))
+ return false;
+
+ /* reference to CONSTANT_Utf8_info containing simple name */
+ nfn->name_index = suck_u2(cb);
+
+ /* reference to CONSTANT_Utf8_info containing field or method
+ descriptor */
+ nfn->sig_index = suck_u2(cb);
+
+ idx++;
+ break;
+
+ case CONSTANT_Fieldref:
+ case CONSTANT_Methodref:
+ case CONSTANT_InterfaceMethodref:
+ nff = DNEW(forward_fieldmethint);
+
+ nff->next = forward_fieldmethints;
+ forward_fieldmethints = nff;
+
+ nff->thisindex = idx;
+ /* constant type */
+ nff->tag = t;
+
+ if (!check_classbuffer_size(cb, 2 + 2))
+ return false;
+
+ /* class or interface type that contains the declaration of the
+ field or method */
+ nff->class_index = suck_u2(cb);
+
+ /* name and descriptor of the field or method */
+ nff->nameandtype_index = suck_u2(cb);
+
+ idx++;
+ break;
+
+ case CONSTANT_Integer: {
+ constant_integer *ci = NEW(constant_integer);
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_const_pool_len += sizeof(constant_integer);
+#endif
+
+ if (!check_classbuffer_size(cb, 4))
+ return false;
+
+ ci->value = suck_s4(cb);
+ cptags[idx] = CONSTANT_Integer;
+ cpinfos[idx] = ci;
+
+ idx++;
+ break;
+ }
+
+ case CONSTANT_Float: {
+ constant_float *cf = NEW(constant_float);
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_const_pool_len += sizeof(constant_float);
+#endif
+
+ if (!check_classbuffer_size(cb, 4))
+ return false;
+
+ cf->value = suck_float(cb);
+ cptags[idx] = CONSTANT_Float;
+ cpinfos[idx] = cf;
+
+ idx++;
+ break;
+ }
+
+ case CONSTANT_Long: {
+ constant_long *cl = NEW(constant_long);
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_const_pool_len += sizeof(constant_long);
+#endif
+
+ if (!check_classbuffer_size(cb, 8))
+ return false;
+
+ cl->value = suck_s8(cb);
+ cptags[idx] = CONSTANT_Long;
+ cpinfos[idx] = cl;
+ idx += 2;
+ if (idx > cpcount) {
+ *exceptionptr =
+ new_classformaterror(c, "Invalid constant pool entry");
+ return false;
+ }
+ break;
+ }
+
+ case CONSTANT_Double: {
+ constant_double *cd = NEW(constant_double);
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_const_pool_len += sizeof(constant_double);
+#endif
+
+ if (!check_classbuffer_size(cb, 8))
+ return false;
+
+ cd->value = suck_double(cb);
+ cptags[idx] = CONSTANT_Double;
+ cpinfos[idx] = cd;
+ idx += 2;
+ if (idx > cpcount) {
+ *exceptionptr =
+ new_classformaterror(c, "Invalid constant pool entry");
+ return false;
+ }
+ break;
+ }
+
+ case CONSTANT_Utf8: {
+ u4 length;
+
+ /* number of bytes in the bytes array (not string-length) */
+ if (!check_classbuffer_size(cb, 2))
+ return false;
+
+ length = suck_u2(cb);
+ cptags[idx] = CONSTANT_Utf8;
+
+ /* validate the string */
+ if (!check_classbuffer_size(cb, length))
+ return false;
+
+ 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");
+ }
+ /* insert utf-string into the utf-symboltable */
+ cpinfos[idx] = utf_new_intern((char *) (cb->pos + 1), length);
+
+ /* skip bytes of the string (buffer size check above) */
+ skip_nbytes(cb, length);
+ idx++;
+ break;
+ }
+
+ default:
+ *exceptionptr =
+ new_classformaterror(c, "Illegal constant pool type");
+ return false;
+ } /* 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 (opt_verify && !is_valid_name_utf(name)) {
+ *exceptionptr =
+ new_classformaterror(c, "Class reference with invalid 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))
+ 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);
+ }
+
+ nfc = forward_classes;
+ forward_classes = forward_classes->next;
+ }
+
+ while (forward_strings) {
+ utf *text =
+ class_getconstant(c, forward_strings->string_index, CONSTANT_Utf8);
+
+ /* resolve utf-string */
+ cptags[forward_strings->thisindex] = CONSTANT_String;
+ cpinfos[forward_strings->thisindex] = text;
+
+ nfs = forward_strings;
+ forward_strings = forward_strings->next;
+ }
+
+ while (forward_nameandtypes) {
+ constant_nameandtype *cn = NEW(constant_nameandtype);
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_const_pool_len += sizeof(constant_nameandtype);
+#endif
+
+ /* resolve simple name and descriptor */
+ cn->name = class_getconstant(c,
+ forward_nameandtypes->name_index,
+ CONSTANT_Utf8);
+
+ cn->descriptor = class_getconstant(c,
+ forward_nameandtypes->sig_index,
+ CONSTANT_Utf8);
+
+ if (opt_verify) {
+ /* check name */
+ if (!is_valid_name_utf(cn->name)) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Illegal Field name \"%s\"",
+ cn->name->text);
+
+ return false;
+ }
+
+ /* disallow referencing <clinit> among others */
+ if (cn->name->text[0] == '<' && cn->name != utf_init) {
+ *exceptionptr =
+ new_exception_utfmessage(string_java_lang_InternalError,
+ cn->name);
+ return false;
+ }
+ }
+
+ cptags[forward_nameandtypes->thisindex] = CONSTANT_NameAndType;
+ cpinfos[forward_nameandtypes->thisindex] = cn;
+
+ nfn = forward_nameandtypes;
+ forward_nameandtypes = forward_nameandtypes->next;
+ }
+
+ while (forward_fieldmethints) {
+ constant_nameandtype *nat;
+ constant_FMIref *fmi = NEW(constant_FMIref);
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_const_pool_len += sizeof(constant_FMIref);
+#endif
+ /* resolve simple name and descriptor */
+ nat = class_getconstant(c,
+ forward_fieldmethints->nameandtype_index,
+ CONSTANT_NameAndType);
+
+ fmi->classref = (constant_classref*) (size_t) forward_fieldmethints->class_index;
+ fmi->name = nat->name;
+ fmi->descriptor = nat->descriptor;
+
+ cptags[forward_fieldmethints->thisindex] = forward_fieldmethints->tag;
+ cpinfos[forward_fieldmethints->thisindex] = fmi;
+
+ nff = forward_fieldmethints;
+ forward_fieldmethints = forward_fieldmethints->next;
+ }
+
+ /* everything was ok */
+
+ return true;
+}
-/************************ Function: field_load *********************************
+/* load_field ******************************************************************
- Load everything about a class field from the class file and fill a
- 'fieldinfo' structure. For static fields, space in the data segment is
- allocated.
+ Load everything about a class field from the class file and fill a
+ 'fieldinfo' structure. For static fields, space in the data segment
+ is allocated.
*******************************************************************************/
#define field_load_NOVALUE 0xffffffff /* must be bigger than any u2 value! */
-static void field_load(classbuffer *cb, classinfo *c, fieldinfo *f)
+static bool load_field(classbuffer *cb, fieldinfo *f,descriptor_pool *descpool)
{
- u4 attrnum,i;
+ classinfo *c;
+ u4 attrnum, i;
u4 jtype;
- u4 pindex = field_load_NOVALUE; /* constantvalue_index */
+ u4 pindex = field_load_NOVALUE; /* constantvalue_index */
+ utf *u;
+
+ c = cb->class;
+
+ if (!check_classbuffer_size(cb, 2 + 2 + 2))
+ return false;
+
+ f->flags = suck_u2(cb);
+
+ 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))
+ return false;
- f->flags = suck_u2(cb); /* ACC flags */
- f->name = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8); /* name of field */
- f->descriptor = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8); /* JavaVM descriptor */
-
if (opt_verify) {
/* check name */
- if (!is_valid_name_utf(f->name) || f->name->text[0] == '<')
- panic("Field with invalid name");
-
+ if (!is_valid_name_utf(f->name) || f->name->text[0] == '<') {
+ *exceptionptr = new_classformaterror(c,
+ "Illegal Field name \"%s\"",
+ f->name->text);
+ return false;
+ }
+
/* check flag consistency */
- i = (f->flags & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED));
- if (i != 0 && i != ACC_PUBLIC && i != ACC_PRIVATE && i != ACC_PROTECTED)
- panic("Field has invalid access flags");
- if ((f->flags & (ACC_FINAL | ACC_VOLATILE)) == (ACC_FINAL | ACC_VOLATILE))
- panic("Field is declared final and volatile");
- if ((c->flags & ACC_INTERFACE) != 0) {
- if ((f->flags & (ACC_STATIC | ACC_PUBLIC | ACC_FINAL))
- != (ACC_STATIC | ACC_PUBLIC | ACC_FINAL))
- panic("Interface field is not declared static final public");
- if ((f->flags & ACC_TRANSIENT) != 0)
- panic("Interface field declared transient");
+ i = f->flags & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED);
+
+ if ((i != 0 && i != ACC_PUBLIC && i != ACC_PRIVATE && i != ACC_PROTECTED) ||
+ ((f->flags & (ACC_FINAL | ACC_VOLATILE)) == (ACC_FINAL | ACC_VOLATILE))) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Illegal field modifiers: 0x%X",
+ f->flags);
+ return false;
}
- /* check descriptor */
- checkfielddescriptor(f->descriptor->text,utf_end(f->descriptor));
+ if (c->flags & ACC_INTERFACE) {
+ if (((f->flags & (ACC_STATIC | ACC_PUBLIC | ACC_FINAL))
+ != (ACC_STATIC | ACC_PUBLIC | ACC_FINAL)) ||
+ f->flags & ACC_TRANSIENT) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Illegal field modifiers: 0x%X",
+ f->flags);
+ return false;
+ }
+ }
}
- f->type = jtype = desc_to_type(f->descriptor); /* data type */
- f->offset = 0; /* offset from start of object */
+ f->type = jtype = desc_to_type(f->descriptor); /* data type */
+ f->offset = 0; /* offset from start of object */
f->class = c;
f->xta = NULL;
switch (f->type) {
- case TYPE_INT: f->value.i = 0; break;
- case TYPE_FLOAT: f->value.f = 0.0; break;
- case TYPE_DOUBLE: f->value.d = 0.0; break;
- case TYPE_ADDRESS: f->value.a = NULL; break;
+ case TYPE_INT: f->value.i = 0; break;
+ case TYPE_FLOAT: f->value.f = 0.0; break;
+ case TYPE_DOUBLE: f->value.d = 0.0; break;
+ case TYPE_ADDRESS: f->value.a = NULL; break;
case TYPE_LONG:
#if U8_AVAILABLE
f->value.l = 0; break;
}
/* read attributes */
+ if (!check_classbuffer_size(cb, 2))
+ return false;
+
attrnum = suck_u2(cb);
for (i = 0; i < attrnum; i++) {
- utf *aname;
+ if (!check_classbuffer_size(cb, 2))
+ return false;
- aname = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
-
- if (aname != utf_constantvalue) {
- /* unknown attribute */
- skipattributebody(cb);
+ if (!(u = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
+ return false;
- } else {
- /* constant value attribute */
+ if (u == utf_ConstantValue) {
+ if (!check_classbuffer_size(cb, 4 + 2))
+ return false;
- if (pindex != field_load_NOVALUE)
- panic("Field has more than one ConstantValue attribute");
-
/* check attribute length */
- if (suck_u4(cb) != 2)
- panic("ConstantValue attribute has invalid length");
+ if (suck_u4(cb) != 2) {
+ *exceptionptr =
+ new_classformaterror(c, "Wrong size for VALUE attribute");
+ return false;
+ }
+
+ /* constant value attribute */
+ if (pindex != field_load_NOVALUE) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Multiple ConstantValue attributes");
+ return false;
+ }
/* index of value in constantpool */
pindex = suck_u2(cb);
/* initialize field with value from constantpool */
switch (jtype) {
case TYPE_INT: {
- constant_integer *ci =
- class_getconstant(c, pindex, CONSTANT_Integer);
+ constant_integer *ci;
+
+ if (!(ci = class_getconstant(c, pindex, CONSTANT_Integer)))
+ return false;
+
f->value.i = ci->value;
}
break;
case TYPE_LONG: {
- constant_long *cl =
- class_getconstant(c, pindex, CONSTANT_Long);
+ constant_long *cl;
+
+ if (!(cl = class_getconstant(c, pindex, CONSTANT_Long)))
+ return false;
+
f->value.l = cl->value;
}
break;
case TYPE_FLOAT: {
- constant_float *cf =
- class_getconstant(c, pindex, CONSTANT_Float);
+ constant_float *cf;
+
+ if (!(cf = class_getconstant(c, pindex, CONSTANT_Float)))
+ return false;
+
f->value.f = cf->value;
}
break;
case TYPE_DOUBLE: {
- constant_double *cd =
- class_getconstant(c, pindex, CONSTANT_Double);
+ constant_double *cd;
+
+ if (!(cd = class_getconstant(c, pindex, CONSTANT_Double)))
+ return false;
+
f->value.d = cd->value;
}
break;
- case TYPE_ADDRESS: {
- utf *u = class_getconstant(c, pindex, CONSTANT_String);
- /* create javastring from compressed utf8-string */
+ case TYPE_ADDRESS:
+ if (!(u = class_getconstant(c, pindex, CONSTANT_String)))
+ return false;
+
+ /* create javastring from compressed utf8-string */
f->value.a = literalstring_new(u);
- }
- break;
+ break;
default:
- log_text ("Invalid Constant - Type");
+ log_text("Invalid Constant - Type");
}
+
+ } else {
+ /* unknown attribute */
+ if (!skipattributebody(cb))
+ return false;
}
}
-}
-
-
-/********************** function: field_free **********************************/
-
-static void field_free (fieldinfo *f)
-{
- /* empty */
-}
-
-/**************** Function: field_display (debugging only) ********************/
+ /* everything was ok */
-void field_display(fieldinfo *f)
-{
- printf(" ");
- printflags(f->flags);
- printf(" ");
- utf_display(f->name);
- printf(" ");
- utf_display(f->descriptor);
- printf(" offset: %ld\n", (long int) (f->offset));
+ return true;
}
-/******************************************************************************/
-/************************* Functions for methods ******************************/
-/******************************************************************************/
-
-
-/*********************** Function: method_load *********************************
+/* load_method *****************************************************************
- Loads a method from the class file and fills an existing 'methodinfo'
- structure. For native methods, the function pointer field is set to the
- real function pointer, for JavaVM methods a pointer to the compiler is used
- preliminarily.
+ Loads a method from the class file and fills an existing
+ 'methodinfo' structure. For native methods, the function pointer
+ field is set to the real function pointer, for JavaVM methods a
+ pointer to the compiler is used preliminarily.
*******************************************************************************/
-static void method_load(classbuffer *cb, classinfo *c, methodinfo *m)
+static bool load_method(classbuffer *cb, methodinfo *m,descriptor_pool *descpool)
{
- u4 attrnum, i, e;
+ classinfo *c;
int argcount;
-
+ s4 i, j;
+ u4 attrnum;
+ u4 codeattrnum;
+ utf *u;
+
+ c = cb->class;
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ initObjectLock(&m->header);
+#endif
+
#ifdef STATISTICS
- count_all_methods++;
+ if (opt_stat)
+ count_all_methods++;
#endif
- m->thrownexceptionscount=0;
- m->linenumbercount=0;
- m->linenumbers=0;
+
+ m->thrownexceptionscount = 0;
+ m->linenumbercount = 0;
+ m->linenumbers = 0;
m->class = c;
+ m->nativelyoverloaded = false;
+ if (!check_classbuffer_size(cb, 2 + 2 + 2))
+ return false;
+
m->flags = suck_u2(cb);
- m->name = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
+
+ 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))
+ return false;
if (opt_verify) {
if (!is_valid_name_utf(m->name))
panic("Method with invalid name");
+
if (m->name->text[0] == '<'
&& m->name != utf_init && m->name != utf_clinit)
panic("Method with invalid special name");
}
- m->descriptor = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
- argcount = checkmethoddescriptor(m->descriptor);
- if ((m->flags & ACC_STATIC) == 0)
+ if (!(m->flags & ACC_STATIC))
argcount++; /* count the 'this' argument */
if (opt_verify) {
- if (argcount > 255)
- panic("Method has more than 255 arguments");
+ if (argcount > 255) {
+ *exceptionptr =
+ new_classformaterror(c, "Too many arguments in signature");
+ return false;
+ }
/* check flag consistency */
if (m->name != utf_clinit) {
i = (m->flags & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED));
- if (i != 0 && i != ACC_PUBLIC && i != ACC_PRIVATE && i != ACC_PROTECTED)
- panic("Method has invalid access flags");
- if ((m->flags & ACC_ABSTRACT) != 0) {
- if ((m->flags & (ACC_FINAL | ACC_NATIVE | ACC_PRIVATE | ACC_STATIC
- | ACC_STRICT | ACC_SYNCHRONIZED)) != 0)
- panic("Abstract method has invalid flags set");
+
+ if (i != 0 && i != ACC_PUBLIC && i != ACC_PRIVATE && i != ACC_PROTECTED) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Illegal method modifiers: 0x%X",
+ m->flags);
+ return false;
+ }
+
+ if (m->flags & ACC_ABSTRACT) {
+ if ((m->flags & (ACC_FINAL | ACC_NATIVE | ACC_PRIVATE |
+ ACC_STATIC | ACC_STRICT | ACC_SYNCHRONIZED))) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Illegal method modifiers: 0x%X",
+ m->flags);
+ return false;
+ }
}
- if ((c->flags & ACC_INTERFACE) != 0) {
- if ((m->flags & (ACC_ABSTRACT | ACC_PUBLIC))
- != (ACC_ABSTRACT | ACC_PUBLIC))
- panic("Interface method is not declared abstract and public");
+
+ if (c->flags & ACC_INTERFACE) {
+ if ((m->flags & (ACC_ABSTRACT | ACC_PUBLIC)) != (ACC_ABSTRACT | ACC_PUBLIC)) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Illegal method modifiers: 0x%X",
+ m->flags);
+ return false;
+ }
}
+
if (m->name == utf_init) {
- if ((m->flags & (ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED
- | ACC_NATIVE | ACC_ABSTRACT)) != 0)
+ if (m->flags & (ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED |
+ ACC_NATIVE | ACC_ABSTRACT))
panic("Instance initialization method has invalid flags set");
}
}
}
m->jcode = NULL;
+ m->basicblockcount = 0;
+ m->basicblocks = NULL;
+ m->basicblockindex = NULL;
+ m->instructioncount = 0;
+ m->instructions = NULL;
+ m->stackcount = 0;
+ m->stack = NULL;
m->exceptiontable = NULL;
- m->entrypoint = NULL;
- m->mcode = NULL;
m->stubroutine = NULL;
+ m->mcode = NULL;
+ m->entrypoint = NULL;
m->methodUsed = NOTUSED;
m->monoPoly = MONO;
m->subRedefs = 0;
m->subRedefsUsed = 0;
m->xta = NULL;
-
- if (!(m->flags & ACC_NATIVE)) {
- m->stubroutine = createcompilerstub(m);
- } else {
- functionptr f = native_findfunction(c->name, m->name, m->descriptor,
- (m->flags & ACC_STATIC) != 0);
- if (f) {
- m->stubroutine = createnativestub(f, m);
- }
- }
-
+ if (!check_classbuffer_size(cb, 2))
+ return false;
attrnum = suck_u2(cb);
for (i = 0; i < attrnum; i++) {
utf *aname;
- aname = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
-
- if (aname != utf_code) {
- if (aname == utf_exceptions) {
- u2 exceptionCount;
- u2 exceptionID;
- suck_u4(cb); /*length*/
- exceptionCount=suck_u2(cb);
- m->thrownexceptionscount=exceptionCount;
- m->thrownexceptions=MNEW(classinfo*,exceptionCount);
- for (exceptionID=0;exceptionID<exceptionCount;exceptionID++) {
- (m->thrownexceptions)[exceptionID]=class_getconstant(c,suck_u2(cb),CONSTANT_Class);
- }
- }
- else
- skipattributebody(cb);
+ if (!check_classbuffer_size(cb, 2))
+ return false;
- } else {
- u4 codelen;
- if ((m->flags & (ACC_ABSTRACT | ACC_NATIVE)) != 0)
- panic("Code attribute for native or abstract method");
-
- if (m->jcode)
- panic("Method has more than one Code attribute");
+ if (!(aname = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
+ return false;
- suck_u4(cb);
- m->maxstack = suck_u2(cb);
- m->maxlocals = suck_u2(cb);
- if (m->maxlocals < argcount)
- panic("max_locals is smaller than the number of arguments");
-
- codelen = suck_u4(cb);
+ if (aname == utf_Code) {
+ if (m->flags & (ACC_ABSTRACT | ACC_NATIVE)) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Code attribute in native or abstract methods");
- if (codelen == 0)
- panic("bytecode has zero length");
+ return false;
+ }
+
+ if (m->jcode) {
+ *exceptionptr =
+ new_classformaterror(c, "Multiple Code attributes");
+
+ return false;
+ }
+
+ if (!check_classbuffer_size(cb, 4 + 2 + 2))
+ return false;
+
+ suck_u4(cb);
+ m->maxstack = suck_u2(cb);
+ m->maxlocals = suck_u2(cb);
+
+ if (m->maxlocals < argcount) {
+ *exceptionptr =
+ new_classformaterror(c, "Arguments can't fit into locals");
+
+ return false;
+ }
+
+ if (!check_classbuffer_size(cb, 4))
+ return false;
+
+ m->jcodelength = suck_u4(cb);
+
+ if (m->jcodelength == 0) {
+ *exceptionptr =
+ new_classformaterror(c, "Code of a method has length 0");
+
+ return false;
+ }
+
+ if (m->jcodelength > 65535) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Code of a method longer than 65535 bytes");
+
+ return false;
+ }
- if (codelen > 65536)
- panic("bytecode too long");
+ if (!check_classbuffer_size(cb, m->jcodelength))
+ return false;
- m->jcodelength = codelen;
m->jcode = MNEW(u1, m->jcodelength);
suck_nbytes(m->jcode, cb, m->jcodelength);
+ if (!check_classbuffer_size(cb, 2))
+ return false;
+
m->exceptiontablelength = suck_u2(cb);
- m->exceptiontable =
- MNEW(exceptiontable, m->exceptiontablelength);
+ if (!check_classbuffer_size(cb, (2 + 2 + 2 + 2) * m->exceptiontablelength))
+ return false;
-#ifdef STATISTICS
- count_vmcode_len += m->jcodelength + 18;
- count_extable_len += 8 * m->exceptiontablelength;
+ m->exceptiontable = MNEW(exceptiontable, m->exceptiontablelength);
+
+#if defined(STATISTICS)
+ if (opt_stat) {
+ count_vmcode_len += m->jcodelength + 18;
+ count_extable_len += 8 * m->exceptiontablelength;
+ }
#endif
- for (e = 0; e < m->exceptiontablelength; e++) {
+ for (j = 0; j < m->exceptiontablelength; j++) {
u4 idx;
- m->exceptiontable[e].startpc = suck_u2(cb);
- m->exceptiontable[e].endpc = suck_u2(cb);
- m->exceptiontable[e].handlerpc = suck_u2(cb);
+ m->exceptiontable[j].startpc = suck_u2(cb);
+ m->exceptiontable[j].endpc = suck_u2(cb);
+ m->exceptiontable[j].handlerpc = suck_u2(cb);
idx = suck_u2(cb);
if (!idx) {
- m->exceptiontable[e].catchtype = NULL;
+ m->exceptiontable[j].catchtype = NULL;
} else {
- m->exceptiontable[e].catchtype =
- class_getconstant(c, idx, CONSTANT_Class);
+ if (!(m->exceptiontable[j].catchtype =
+ class_getconstant(c, idx, CONSTANT_Class)))
+ return false;
}
- }
- {
- u2 codeattrnum;
- for (codeattrnum=suck_u2(cb);codeattrnum>0;codeattrnum--) {
- utf * caname = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
- if (caname==utf_linenumbertable) {
- u2 lncid;
- /*log_text("LineNumberTable found");*/
- suck_u4(cb);
- m->linenumbercount=suck_u2(cb);
- /*printf("length:%d\n",m->linenumbercount);*/
- m->linenumbers=MNEW(lineinfo,m->linenumbercount);
- for (lncid=0;lncid<m->linenumbercount;lncid++) {
- m->linenumbers[lncid].start_pc=suck_u2(cb);
- m->linenumbers[lncid].line_number=suck_u2(cb);
- }
- codeattrnum--;
- skipattributes(cb, codeattrnum);
- break;
- } else skipattributebody(cb);
-
- }
}
- }
- }
- if (!m->jcode && (m->flags & (ACC_ABSTRACT | ACC_NATIVE)) == 0)
- panic("Method missing Code attribute");
-}
+ if (!check_classbuffer_size(cb, 2))
+ return false;
+ codeattrnum = suck_u2(cb);
-/********************* Function: method_free ***********************************
+ for (; codeattrnum > 0; codeattrnum--) {
+ utf *caname;
- frees all memory that was allocated for this method
+ if (!check_classbuffer_size(cb, 2))
+ return false;
-*******************************************************************************/
+ if (!(caname = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
+ return false;
-static void method_free(methodinfo *m)
-{
- if (m->jcode)
- MFREE(m->jcode, u1, m->jcodelength);
+ if (caname == utf_LineNumberTable) {
+ u2 lncid;
- if (m->exceptiontable)
- MFREE(m->exceptiontable, exceptiontable, m->exceptiontablelength);
+ if (!check_classbuffer_size(cb, 4 + 2))
+ return false;
- if (m->mcode)
- CFREE(m->mcode, m->mcodelength);
+ suck_u4(cb);
+ m->linenumbercount = suck_u2(cb);
- if (m->stubroutine) {
- if (m->flags & ACC_NATIVE) {
- removenativestub(m->stubroutine);
+ if (!check_classbuffer_size(cb,
+ (2 + 2) * m->linenumbercount))
+ return false;
+ m->linenumbers = MNEW(lineinfo, m->linenumbercount);
+
+ for (lncid = 0; lncid < m->linenumbercount; lncid++) {
+ m->linenumbers[lncid].start_pc = suck_u2(cb);
+ m->linenumbers[lncid].line_number = suck_u2(cb);
+ }
+ codeattrnum--;
+
+ if (!skipattributes(cb, codeattrnum))
+ return false;
+
+ break;
+
+ } else {
+ if (!skipattributebody(cb))
+ return false;
+ }
+ }
+
+ } else if (aname == utf_Exceptions) {
+ s4 j;
+
+ if (m->thrownexceptions) {
+ *exceptionptr =
+ new_classformaterror(c, "Multiple Exceptions attributes");
+ return false;
+ }
+
+ if (!check_classbuffer_size(cb, 4 + 2))
+ return false;
+
+ suck_u4(cb); /* length */
+ m->thrownexceptionscount = suck_u2(cb);
+
+ if (!check_classbuffer_size(cb, 2 * m->thrownexceptionscount))
+ return false;
+
+ m->thrownexceptions = MNEW(classinfo*, m->thrownexceptionscount);
+
+ for (j = 0; j < m->thrownexceptionscount; j++) {
+ if (!((m->thrownexceptions)[j] =
+ class_getconstant(c, suck_u2(cb), CONSTANT_Class)))
+ return false;
+ }
+
} else {
- removecompilerstub(m->stubroutine);
+ if (!skipattributebody(cb))
+ return false;
}
}
-}
-
-/************** Function: method_display (debugging only) **************/
+ if (!m->jcode && !(m->flags & (ACC_ABSTRACT | ACC_NATIVE))) {
+ *exceptionptr = new_classformaterror(c, "Missing Code attribute");
-void method_display(methodinfo *m)
-{
- printf(" ");
- printflags(m->flags);
- printf(" ");
- utf_display(m->name);
- printf(" ");
- utf_display(m->descriptor);
- printf("\n");
-}
+ return false;
+ }
-/************** Function: method_display_flags_last (debugging only) **************/
+ /* everything was ok */
-void method_display_flags_last(methodinfo *m)
-{
- printf(" ");
- utf_display(m->name);
- printf(" ");
- utf_display(m->descriptor);
- printf(" ");
- printflags(m->flags);
- printf("\n");
+ return true;
}
-/******************** Function: method_canoverwrite ****************************
+/* load_attribute **************************************************************
- Check if m and old are identical with respect to type and name. This means
- that old can be overwritten with m.
+ Read attributes from classfile.
*******************************************************************************/
-static bool method_canoverwrite(methodinfo *m, methodinfo *old)
+static bool load_attributes(classbuffer *cb, u4 num)
{
- if (m->name != old->name) return false;
- if (m->descriptor != old->descriptor) return false;
- if (m->flags & ACC_STATIC) return false;
- return true;
-}
-
+ classinfo *c;
+ utf *aname;
+ u4 i, j;
-/******************************************************************************/
-/************************ Functions for class *********************************/
-/******************************************************************************/
+ c = cb->class;
+ for (i = 0; i < num; i++) {
+ /* retrieve attribute name */
+ if (!check_classbuffer_size(cb, 2))
+ return false;
-/******************** function:: class_getconstant *****************************
+ if (!(aname = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
+ return false;
- 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
+ if (aname == utf_InnerClasses) {
+ /* innerclasses attribute */
+ if (c->innerclass) {
+ *exceptionptr =
+ new_classformaterror(c, "Multiple InnerClasses attributes");
+ return false;
+ }
+
+ if (!check_classbuffer_size(cb, 4 + 2))
+ return false;
-*******************************************************************************/
+ /* skip attribute length */
+ suck_u4(cb);
-voidptr class_getconstant(classinfo *c, u4 pos, u4 ctype)
-{
- /* invalid position in constantpool */
- /* (pos == 0 is caught by type comparison) */
- if (pos >= c->cpcount)
- panic("Attempt to access constant outside range");
+ /* number of records */
+ c->innerclasscount = suck_u2(cb);
- /* check type of constantpool entry */
+ if (!check_classbuffer_size(cb, (2 + 2 + 2 + 2) * c->innerclasscount))
+ return false;
- if (c->cptags[pos] != ctype) {
- class_showconstantpool(c);
- error("Type mismatch on constant: %d requested, %d here (class_getconstant)",
- (int) ctype, (int) c->cptags[pos]);
- }
-
- return c->cpinfos[pos];
-}
+ /* allocate memory for innerclass structure */
+ c->innerclass = MNEW(innerclassinfo, c->innerclasscount);
+ for (j = 0; j < c->innerclasscount; j++) {
+ /* The innerclass structure contains a class with an encoded
+ name, its defining scope, its simple name and a bitmask of
+ the access flags. If an inner class is not a member, its
+ outer_class is NULL, if a class is anonymous, its name is
+ NULL. */
+
+ innerclassinfo *info = c->innerclass + j;
-/********************* Function: class_constanttype ****************************
+ info->inner_class =
+ innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
+ info->outer_class =
+ innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
+ info->name =
+ innerclass_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
+ info->flags = suck_u2(cb);
+ }
- Determines the type of a class entry in the ConstantPool
-
-*******************************************************************************/
+ } else if (aname == utf_SourceFile) {
+ if (!check_classbuffer_size(cb, 4 + 2))
+ return false;
-u4 class_constanttype(classinfo *c, u4 pos)
-{
- if (pos >= c->cpcount)
- panic("Attempt to access constant outside range");
+ if (suck_u4(cb) != 2) {
+ *exceptionptr =
+ new_classformaterror(c, "Wrong size for VALUE attribute");
+ return false;
+ }
- return c->cptags[pos];
-}
+ if (c->sourcefile) {
+ *exceptionptr =
+ new_classformaterror(c, "Multiple SourceFile attributes");
+ return false;
+ }
+ if (!(c->sourcefile = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
+ return false;
-/******************** function: class_loadcpool ********************************
+ } else {
+ /* unknown attribute */
+ if (!skipattributebody(cb))
+ return false;
+ }
+ }
- loads the constantpool of a class,
- the entries are transformed into a simpler format
- by resolving references
- (a detailed overview of the compact structures can be found in global.h)
+ return true;
+}
-*******************************************************************************/
-static void class_loadcpool(classbuffer *cb, classinfo *c)
-{
+/* load_class_from_classloader *************************************************
- /* The following structures are used to save information which cannot be
- processed during the first pass. After the complete constantpool has
- been traversed the references can be resolved.
- (only in specific order) */
+ XXX
- /* CONSTANT_Class_info entries */
- typedef struct forward_class {
- struct forward_class *next;
- u2 thisindex;
- u2 name_index;
- } forward_class;
-
- /* CONSTANT_String */
- typedef struct forward_string {
- struct forward_string *next;
- u2 thisindex;
- u2 string_index;
- } forward_string;
+*******************************************************************************/
- /* CONSTANT_NameAndType */
- typedef struct forward_nameandtype {
- struct forward_nameandtype *next;
- u2 thisindex;
- u2 name_index;
- u2 sig_index;
- } forward_nameandtype;
+classinfo *load_class_from_classloader(classinfo *c, java_objectheader *cl)
+{
+ classinfo *r;
- /* CONSTANT_Fieldref, CONSTANT_Methodref or CONSTANT_InterfaceMethodref */
- typedef struct forward_fieldmethint {
- struct forward_fieldmethint *next;
- u2 thisindex;
- u1 tag;
- u2 class_index;
- u2 nameandtype_index;
- } forward_fieldmethint;
+ /* if other class loader than bootstrap, call it */
+ if (cl) {
+ methodinfo *lc;
- u4 idx;
- long int dumpsize = dump_size ();
+ lc = class_resolveclassmethod(cl->vftbl->class,
+ utf_loadClass,
+ utf_java_lang_String__java_lang_Class,
+ class_java_lang_Object,
+ true);
- forward_class *forward_classes = NULL;
- forward_string *forward_strings = NULL;
- forward_nameandtype *forward_nameandtypes = NULL;
- forward_fieldmethint *forward_fieldmethints = NULL;
+ if (!lc)
+ return NULL;
- /* number of entries in the constant_pool table plus one */
- u4 cpcount = c->cpcount = suck_u2(cb);
+ r = (classinfo *) asm_calljavafunction(lc,
+ cl,
+ javastring_new(c->name),
+ NULL, NULL);
- /* allocate memory */
- u1 *cptags = c->cptags = MNEW(u1, cpcount);
- voidptr *cpinfos = c->cpinfos = MNEW(voidptr, cpcount);
+ return r;
- if (!cpcount)
- panic("Invalid constant_pool_count (0)");
-
-#ifdef STATISTICS
- count_const_pool_len += (sizeof(voidptr) + 1) * cpcount;
-#endif
-
- /* initialize constantpool */
- for (idx = 0; idx < cpcount; idx++) {
- cptags[idx] = CONSTANT_UNUSED;
- cpinfos[idx] = NULL;
+ } else {
+ return load_class_bootstrap(c);
}
+}
-
- /******* first pass *******/
- /* entries which cannot be resolved now are written into
- temporary structures and traversed again later */
-
- idx = 1;
- while (idx < cpcount) {
- /* get constant type */
- u4 t = suck_u1(cb);
- switch (t) {
- case CONSTANT_Class: {
- forward_class *nfc = DNEW(forward_class);
+/* load_class_bootstrap ********************************************************
+
+ XXX
- nfc -> next = forward_classes;
- forward_classes = nfc;
+*******************************************************************************/
- nfc -> thisindex = idx;
- /* reference to CONSTANT_NameAndType */
- nfc -> name_index = suck_u2(cb);
+classinfo *load_class_bootstrap(classinfo *c)
+{
+ classbuffer *cb;
+ classinfo *r;
- idx++;
- break;
- }
-
- case CONSTANT_Fieldref:
- case CONSTANT_Methodref:
- case CONSTANT_InterfaceMethodref: {
- forward_fieldmethint *nff = DNEW (forward_fieldmethint);
-
- nff -> next = forward_fieldmethints;
- forward_fieldmethints = nff;
-
- nff -> thisindex = idx;
- /* constant type */
- nff -> tag = t;
- /* class or interface type that contains the declaration of the field or method */
- nff -> class_index = suck_u2(cb);
- /* name and descriptor of the field or method */
- nff -> nameandtype_index = suck_u2(cb);
-
- idx ++;
- break;
- }
-
- case CONSTANT_String: {
- forward_string *nfs = DNEW(forward_string);
-
- nfs->next = forward_strings;
- forward_strings = nfs;
-
- nfs->thisindex = idx;
- /* reference to CONSTANT_Utf8_info with string characters */
- nfs->string_index = suck_u2(cb);
-
- idx ++;
- break;
- }
+#if defined(USE_THREADS)
+ /* enter a monitor on the class */
- case CONSTANT_NameAndType: {
- forward_nameandtype *nfn = DNEW (forward_nameandtype);
-
- nfn -> next = forward_nameandtypes;
- forward_nameandtypes = nfn;
-
- nfn -> thisindex = idx;
- /* reference to CONSTANT_Utf8_info containing simple name */
- nfn -> name_index = suck_u2(cb);
- /* reference to CONSTANT_Utf8_info containing field or method descriptor */
- nfn -> sig_index = suck_u2(cb);
-
- idx ++;
- break;
- }
+ builtin_monitorenter((java_objectheader *) c);
+#endif
- case CONSTANT_Integer: {
- constant_integer *ci = NEW (constant_integer);
+ /* maybe the class is already loaded */
-#ifdef STATISTICS
- count_const_pool_len += sizeof(constant_integer);
+ if (c->loaded) {
+#if defined(USE_THREADS)
+ builtin_monitorexit((java_objectheader *) c);
#endif
- ci -> value = suck_s4(cb);
- cptags [idx] = CONSTANT_Integer;
- cpinfos [idx] = ci;
- idx ++;
-
- break;
- }
-
- case CONSTANT_Float: {
- constant_float *cf = NEW (constant_float);
+ return c;
+ }
-#ifdef STATISTICS
- count_const_pool_len += sizeof(constant_float);
-#endif
+#if defined(STATISTICS)
+ /* measure time */
- cf -> value = suck_float(cb);
- cptags [idx] = CONSTANT_Float;
- cpinfos[idx] = cf;
- idx ++;
- break;
- }
-
- case CONSTANT_Long: {
- constant_long *cl = NEW(constant_long);
-
-#ifdef STATISTICS
- count_const_pool_len += sizeof(constant_long);
-#endif
+ if (getcompilingtime)
+ compilingtime_stop();
- cl -> value = suck_s8(cb);
- cptags [idx] = CONSTANT_Long;
- cpinfos [idx] = cl;
- idx += 2;
- if (idx > cpcount)
- panic("Long constant exceeds constant pool");
- break;
- }
-
- case CONSTANT_Double: {
- constant_double *cd = NEW(constant_double);
-
-#ifdef STATISTICS
- count_const_pool_len += sizeof(constant_double);
+ if (getloadingtime)
+ loadingtime_start();
#endif
- cd -> value = suck_double(cb);
- cptags [idx] = CONSTANT_Double;
- cpinfos [idx] = cd;
- idx += 2;
- if (idx > cpcount)
- panic("Double constant exceeds constant pool");
- break;
- }
-
- case CONSTANT_Utf8: {
-
- /* number of bytes in the bytes array (not string-length) */
- u4 length = suck_u2(cb);
- cptags [idx] = CONSTANT_Utf8;
- /* validate the string */
- ASSERT_LEFT(cb, length);
- if (opt_verify &&
- !is_valid_utf(cb->pos + 1, cb->pos + 1 + length))
- {
- dolog("Invalid UTF-8 string (constant pool index %d)",idx);
- panic("Invalid UTF-8 string");
- }
- /* insert utf-string into the utf-symboltable */
- cpinfos[idx] = utf_new_int(cb->pos + 1, length);
+ /* load classdata, throw exception on error */
- /* skip bytes of the string */
- skip_nbytes(cb, length);
- idx++;
- break;
- }
-
- default:
- error ("Unkown constant type: %d",(int) t);
-
- } /* end switch */
-
- } /* end while */
-
+ if ((cb = suck_start(c)) == NULL) {
+ /* this means, the classpath was not set properly */
+ if (c->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);
- /* resolve entries in temporary structures */
+#if defined(USE_THREADS)
+ builtin_monitorexit((java_objectheader *) c);
+#endif
- while (forward_classes) {
- utf *name =
- class_getconstant (c, forward_classes -> name_index, CONSTANT_Utf8);
+ return NULL;
+ }
+
+ /* load the class from the buffer */
- if (opt_verify && !is_valid_name_utf(name))
- panic("Class reference with invalid name");
+ r = load_class_from_classbuffer(cb);
- cptags [forward_classes -> thisindex] = CONSTANT_Class;
- /* retrieve class from class-table */
- cpinfos [forward_classes -> thisindex] = class_new_int (name);
+ /* if return value is NULL, we had a problem and the class is not loaded */
+ if (!r) {
+ c->loaded = false;
- forward_classes = forward_classes -> next;
-
- }
+ /* now free the allocated memory, otherwise we could ran into a DOS */
+ class_remove(c);
+ }
- while (forward_strings) {
- utf *text =
- class_getconstant (c, forward_strings -> string_index, CONSTANT_Utf8);
+ /* free memory */
+ suck_stop(cb);
- /* resolve utf-string */
- cptags [forward_strings -> thisindex] = CONSTANT_String;
- cpinfos [forward_strings -> thisindex] = text;
-
- forward_strings = forward_strings -> next;
- }
+#if defined(STATISTICS)
+ /* measure time */
- while (forward_nameandtypes) {
- constant_nameandtype *cn = NEW (constant_nameandtype);
+ if (getloadingtime)
+ loadingtime_stop();
-#ifdef STATISTICS
- count_const_pool_len += sizeof(constant_nameandtype);
+ if (getcompilingtime)
+ compilingtime_start();
#endif
- /* resolve simple name and descriptor */
- cn -> name = class_getconstant
- (c, forward_nameandtypes -> name_index, CONSTANT_Utf8);
- cn -> descriptor = class_getconstant
- (c, forward_nameandtypes -> sig_index, CONSTANT_Utf8);
+#if defined(USE_THREADS)
+ /* leave the monitor */
- if (opt_verify) {
- /* check name */
- if (!is_valid_name_utf(cn->name))
- panic("NameAndType with invalid name");
- /* disallow referencing <clinit> among others */
- if (cn->name->text[0] == '<' && cn->name != utf_init)
- panic("NameAndType with invalid special name");
- }
-
- cptags [forward_nameandtypes -> thisindex] = CONSTANT_NameAndType;
- cpinfos [forward_nameandtypes -> thisindex] = cn;
-
- forward_nameandtypes = forward_nameandtypes -> next;
- }
-
-
- while (forward_fieldmethints) {
- constant_nameandtype *nat;
- constant_FMIref *fmi = NEW(constant_FMIref);
-
-#ifdef STATISTICS
- count_const_pool_len += sizeof(constant_FMIref);
+ builtin_monitorexit((java_objectheader *) c);
#endif
- /* resolve simple name and descriptor */
- nat = class_getconstant(c,
- forward_fieldmethints->nameandtype_index,
- CONSTANT_NameAndType);
-
- fmi->class = class_getconstant(c,
- forward_fieldmethints->class_index,
- CONSTANT_Class);
- fmi->name = nat->name;
- fmi->descriptor = nat->descriptor;
-
- cptags[forward_fieldmethints->thisindex] = forward_fieldmethints->tag;
- cpinfos[forward_fieldmethints->thisindex] = fmi;
-
- switch (forward_fieldmethints->tag) {
- case CONSTANT_Fieldref: /* check validity of descriptor */
- checkfielddescriptor(fmi->descriptor->text,utf_end(fmi->descriptor));
- break;
- case CONSTANT_InterfaceMethodref:
- case CONSTANT_Methodref: /* check validity of descriptor */
- checkmethoddescriptor(fmi->descriptor);
- break;
- }
-
- forward_fieldmethints = forward_fieldmethints->next;
- }
-
-/* class_showconstantpool(c); */
- dump_release(dumpsize);
+ return r;
}
-/********************** Function: class_load ***********************************
+/* load_class_from_classbuffer *************************************************
- Loads everything interesting about a class from the class file. The
- 'classinfo' structure must have been allocated previously.
+ Loads everything interesting about a class from the class file. The
+ 'classinfo' structure must have been allocated previously.
- The super class and the interfaces implemented by this class need not be
- loaded. The link is set later by the function 'class_link'.
+ The super class and the interfaces implemented by this class need
+ not be loaded. The link is set later by the function 'class_link'.
- The loaded class is removed from the list 'unloadedclasses' and added to
- the list 'unlinkedclasses'.
+ The loaded class is removed from the list 'unloadedclasses' and
+ added to the list 'unlinkedclasses'.
*******************************************************************************/
-classinfo *class_load_intern(classbuffer *cb);
-
-classinfo *class_load(classinfo *c)
-{
- classbuffer *cb;
- classinfo *r;
- s8 starttime;
- s8 stoptime;
-
-#if defined(USE_THREADS)
-#if defined(NATIVE_THREADS)
- compiler_lock();
- tables_lock();
-#else
- intsDisable();
-#endif
-#endif
-
- /* maybe the class is already loaded */
- if (c->loaded) {
-#if defined(USE_THREADS)
-#if defined(NATIVE_THREADS)
- tables_unlock();
- compiler_unlock();
-#else
- intsRestore();
-#endif
-#endif
-
- return c;
- }
-
- /* measure time */
- if (getloadingtime)
- starttime = getcputime();
-
- /* 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) {
- printf("Exception in thread \"main\" java.lang.NoClassDefFoundError: java/lang/Object\n");
- exit(1);
- }
-
- *exceptionptr =
- new_exception_utfmessage(string_java_lang_NoClassDefFoundError,
- c->name);
-
-#if defined(USE_THREADS)
-#if defined(NATIVE_THREADS)
- tables_unlock();
- compiler_unlock();
-#else
- intsRestore();
-#endif
-#endif
-
- return NULL;
- }
-
- /* call the internal function */
- r = class_load_intern(cb);
-
- /* if return value is NULL, we had a problem and the class is not loaded */
- if (!r)
- c->loaded = false;
-
- /* free memory */
- suck_stop(cb);
-
- /* measure time */
- if (getloadingtime) {
- stoptime = getcputime();
- loadingtime += (stoptime - starttime);
- }
-
-#if defined(USE_THREADS)
-#if defined(NATIVE_THREADS)
- tables_unlock();
- compiler_unlock();
-#else
- intsRestore();
-#endif
-#endif
-
- return r;
-}
-
-
-classinfo *class_load_intern(classbuffer *cb)
+classinfo *load_class_from_classbuffer(classbuffer *cb)
{
classinfo *c;
+ classinfo *tc;
u4 i;
- u4 mi, ma;
- s4 classdata_left;
+ u4 ma, mi;
+ s4 dumpsize;
+ descriptor_pool *descpool;
+ char msg[MAXLOGTEXT]; /* maybe we get an exception */
+#if defined(STATISTICS)
+ u4 classrefsize;
+ u4 descsize;
+#endif
/* get the classbuffer's class */
c = cb->class;
if (c->loaded)
return c;
-#ifdef STATISTICS
- count_class_loads++;
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_class_loads++;
#endif
/* output for debugging purposes */
- if (loadverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Loading class: ");
- utf_sprint_classname(logtext + strlen(logtext), c->name);
- log_text(logtext);
- }
+ 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) {
- char logtext[MAXLOGTEXT];
- utf_sprint_classname(logtext, c->name);
- sprintf(logtext + strlen(logtext), " (Bad magic number)");
+ *exceptionptr = new_classformaterror(c, "Bad magic number");
- *exceptionptr =
- new_exception_message(string_java_lang_ClassFormatError,
- logtext);
-
- return NULL;
+ goto return_exception;
}
/* check version */
mi = suck_u2(cb);
ma = suck_u2(cb);
- if (ma != MAJOR_VERSION && (ma != MAJOR_VERSION + 1 || mi != 0)) {
- char logtext[MAXLOGTEXT];
- utf_sprint_classname(logtext, c->name);
- sprintf(logtext + strlen(logtext),
- " (Unsupported major.minor version %d.%d)", ma, mi);
-
+ if (!(ma < MAJOR_VERSION || (ma == MAJOR_VERSION && mi <= MINOR_VERSION))) {
*exceptionptr =
- new_exception_message(string_java_lang_ClassFormatError,
- logtext);
+ new_unsupportedclassversionerror(c,
+ "Unsupported major.minor version %d.%d",
+ ma, mi);
- return NULL;
+ goto return_exception;
}
- class_loadcpool(cb, c);
+ /* create a new descriptor pool */
+ descpool = descriptor_pool_new(c);
+
+ /* load the constant pool */
+ if (!load_constantpool(cb,descpool))
+ goto return_exception;
+
/*JOWENN*/
c->erroneous_state = 0;
c->initializing_thread = 0;
c->impldBy = NULL;
/* ACC flags */
- c->flags = suck_u2(cb);
+ 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) != 0) {
- if ((c->flags & ACC_ABSTRACT) == 0) {
+ 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)) != 0)
- panic("Interface class has invalid flags");
- if ((c->flags & (ACC_SUPER)) != 0)
+
+ if (c->flags & ACC_FINAL) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Illegal class modifiers: 0x%X", c->flags);
+
+ goto return_exception;
+ }
+
+ if (c->flags & ACC_SUPER) {
c->flags &= ~ACC_SUPER; /* kjc seems to set this on interfaces */
+ }
+ }
+
+ if ((c->flags & (ACC_ABSTRACT | ACC_FINAL)) == (ACC_ABSTRACT | ACC_FINAL)) {
+ *exceptionptr =
+ new_classformaterror(c, "Illegal class modifiers: 0x%X", c->flags);
+
+ goto return_exception;
}
- if ((c->flags & (ACC_ABSTRACT | ACC_FINAL)) == (ACC_ABSTRACT | ACC_FINAL))
- panic("Class is declared both abstract and final");
+
+ if (!check_classbuffer_size(cb, 2 + 2))
+ goto return_exception;
/* this class */
i = suck_u2(cb);
- if (class_getconstant(c, i, CONSTANT_Class) != c) {
- char message[MAXLOGTEXT];
- utf_sprint(message, c->name);
- sprintf(message + strlen(message), " (wrong name: ");
- utf_sprint(message + strlen(message),
- ((classinfo *) class_getconstant(c, i, CONSTANT_Class))->name);
- sprintf(message + strlen(message), ")");
+ if (!(tc = class_getconstant(c, i, CONSTANT_Class)))
+ goto return_exception;
+
+ if (tc != c) {
+ utf_sprint(msg, c->name);
+ sprintf(msg + strlen(msg), " (wrong name: ");
+ utf_sprint(msg + strlen(msg), tc->name);
+ sprintf(msg + strlen(msg), ")");
*exceptionptr =
- new_exception_message(string_java_lang_NoClassDefFoundError,
- message);
+ new_exception_message(string_java_lang_NoClassDefFoundError, msg);
- return NULL;
+ goto return_exception;
}
/* retrieve superclass */
if ((i = suck_u2(cb))) {
- c->super = class_getconstant(c, i, CONSTANT_Class);
+ if (!(c->super.cls = 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)
- panic("java.lang.Object with super class");
+ if (c->name == utf_java_lang_Object) {
+ *exceptionptr =
+ new_exception_message(string_java_lang_ClassFormatError,
+ "java.lang.Object with superclass");
- /* Interfaces must have j.l.O as super class. */
+ goto return_exception;
+ }
+
+ /* Interfaces must have java.lang.Object as super class. */
if ((c->flags & ACC_INTERFACE) &&
- c->super->name != utf_java_lang_Object) {
- panic("Interface with super class other than java.lang.Object");
+ c->super.cls->name != utf_java_lang_Object) {
+ *exceptionptr =
+ new_exception_message(string_java_lang_ClassFormatError,
+ "Interfaces must have java.lang.Object as superclass");
+
+ goto return_exception;
}
} else {
- c->super = NULL;
+ c->super.any = NULL;
/* This is only allowed for java.lang.Object. */
- if (c->name != utf_java_lang_Object)
- panic("Class (not java.lang.Object) without super class");
+ if (c->name != utf_java_lang_Object) {
+ *exceptionptr = new_classformaterror(c, "Bad superclass index");
+
+ goto return_exception;
+ }
}
/* retrieve interfaces */
+ if (!check_classbuffer_size(cb, 2))
+ goto return_exception;
+
c->interfacescount = suck_u2(cb);
- c->interfaces = MNEW(classinfo*, c->interfacescount);
+
+ if (!check_classbuffer_size(cb, 2 * c->interfacescount))
+ goto return_exception;
+
+ c->interfaces = MNEW(classref_or_classinfo, c->interfacescount);
for (i = 0; i < c->interfacescount; i++) {
- c->interfaces[i] =
- class_getconstant(c, suck_u2(cb), CONSTANT_Class);
+ if (!(c->interfaces[i].cls = class_getconstant(c, suck_u2(cb), CONSTANT_Class)))
+ goto return_exception;
}
/* load fields */
- c->fieldscount = suck_u2(cb);
+ if (!check_classbuffer_size(cb, 2))
+ goto return_exception;
+ c->fieldscount = suck_u2(cb);
c->fields = GCNEW(fieldinfo, c->fieldscount);
+/* c->fields = MNEW(fieldinfo, c->fieldscount); */
for (i = 0; i < c->fieldscount; i++) {
- field_load(cb, c, &(c->fields[i]));
+ if (!load_field(cb, &(c->fields[i]),descpool))
+ goto return_exception;
}
/* load methods */
+ if (!check_classbuffer_size(cb, 2))
+ goto return_exception;
+
c->methodscount = suck_u2(cb);
+/* c->methods = GCNEW(methodinfo, c->methodscount); */
c->methods = MNEW(methodinfo, c->methodscount);
for (i = 0; i < c->methodscount; i++) {
- method_load(cb, c, &(c->methods[i]));
- }
-
- /* 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.
- */
- static int shift = 0;
- u2 *hashtab;
- u2 *next; /* for chaining colliding hash entries */
- size_t len;
- size_t hashlen;
- u2 index;
- u2 old;
-
- /* Allocate hashtable */
- len = c->methodscount;
- if (len < c->fieldscount) len = c->fieldscount;
- hashlen = 5 * len;
- hashtab = MNEW(u2,(hashlen + len));
- next = hashtab + hashlen;
-
- /* Determine bitshift (to get good hash values) */
- if (!shift) {
- len = sizeof(utf);
- while (len) {
- len >>= 1;
- shift++;
- }
- }
-
- /* Check fields */
- memset(hashtab, 0, sizeof(u2) * (hashlen + len));
- for (i = 0; i < c->fieldscount; ++i) {
- fieldinfo *fi = c->fields + i;
- /* It's ok if we lose bits here */
- index = ((((size_t)fi->name) + ((size_t)fi->descriptor)) >> shift)
- % hashlen;
- if ((old = hashtab[index]) != 0) {
- old--;
- /* dolog("HASHHIT %d --> %d",index,old); */
- next[i] = old;
- do {
- /* dolog("HASHCHECK %d",old); */
- if (c->fields[old].name == fi->name &&
- c->fields[old].descriptor == fi->descriptor) {
- dolog("Duplicate field (%d,%d):",i,old);
- log_utf(fi->name); log_utf(fi->descriptor);
- panic("Fields with same name and descriptor");
- }
- } while ((old = next[old]) != 0);
- }
- /* else dolog("HASHLUCKY"); */
- hashtab[index] = i + 1;
- }
-
- /* Check methods */
- memset(hashtab, 0, sizeof(u2) * (hashlen + len));
- for (i = 0; i < c->methodscount; ++i) {
- methodinfo *mi = c->methods + i;
- /* It's ok if we lose bits here */
- index = ((((size_t)mi->name) + ((size_t)mi->descriptor)) >> shift)
- % hashlen;
- if ((old = hashtab[index]) != 0) {
- old--;
- /* dolog("HASHHIT %d --> %d",index,old); */
- next[i] = old;
- do {
- /* dolog("HASHCHECK %d",old); */
- if (c->methods[old].name == mi->name &&
- c->methods[old].descriptor == mi->descriptor) {
- dolog("Duplicate method (%d,%d):",i,old);
- log_utf(mi->name); log_utf(mi->descriptor);
- panic("Methods with same name and descriptor");
- }
- } while ((old = next[old]) != 0);
- }
- /* else dolog("HASHLUCKY"); */
- hashtab[index] = i + 1;
- }
-
- MFREE(hashtab,u2,(hashlen + len));
- }
-
-#ifdef STATISTICS
- count_class_infos += sizeof(classinfo*) * c->interfacescount;
- count_class_infos += sizeof(fieldinfo) * c->fieldscount;
- count_class_infos += sizeof(methodinfo) * c->methodscount;
-#endif
-
- /* load variable-length attribute structures */
- attribute_load(cb, c, suck_u2(cb));
-
-#if 0
- /* XXX TWISTI is this still in the JVM spec? SUN and IBM don't complain about it */
-
- /* check if all data has been read */
- classdata_left = ((cb->data + cb->size) - cb->pos - 1);
-
- if (classdata_left > 0) {
- /* surplus */
- dolog("There are %d extra bytes at end of classfile", classdata_left);
- /* The JVM spec disallows extra bytes. */
- panic("Extra bytes at end of classfile");
+ if (!load_method(cb, &(c->methods[i]),descpool))
+ goto return_exception;
}
-#endif
-
- return c;
-}
-
-
-/************** internal Function: class_highestinterface **********************
+ /* create the class reference table */
+ c->classrefs = descriptor_pool_create_classrefs(descpool,&(c->classrefcount));
- Used by the function class_link to determine the amount of memory needed
- for the interface table.
+ /* allocate space for the parsed descriptors */
+ descriptor_pool_alloc_parsed_descriptors(descpool);
+ c->parseddescs = descriptor_pool_get_parsed_descriptors(descpool,&(c->parseddescsize));
-*******************************************************************************/
-
-static s4 class_highestinterface(classinfo *c)
-{
- s4 h;
- s4 i;
-
- if (!(c->flags & ACC_INTERFACE)) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Interface-methods count requested for non-interface: ");
- utf_sprint(logtext + strlen(logtext), c->name);
- error("%s",logtext);
+#if defined(STATISTICS)
+ if (opt_stat) {
+ descriptor_pool_get_sizes(descpool,&classrefsize,&descsize);
+ count_classref_len += classrefsize;
+ count_parsed_desc_len += descsize;
}
-
- h = c->index;
- for (i = 0; i < c->interfacescount; i++) {
- s4 h2 = class_highestinterface(c->interfaces[i]);
- if (h2 > h) h = h2;
- }
-
- return h;
-}
-
-
-/* class_addinterface **********************************************************
-
- Is needed by class_link for adding a VTBL to a class. All interfaces
- implemented by ic are added as well.
-
-*******************************************************************************/
-
-static void class_addinterface (classinfo *c, classinfo *ic)
-{
- s4 j, m;
- s4 i = ic->index;
- vftbl *vftbl = c->vftbl;
-
- if (i >= vftbl->interfacetablelength)
- panic ("Inernal error: interfacetable overflow");
- if (vftbl->interfacetable[-i])
- return;
-
- if (ic->methodscount == 0) { /* fake entry needed for subtype test */
- vftbl->interfacevftbllength[i] = 1;
- vftbl->interfacetable[-i] = MNEW(methodptr, 1);
- vftbl->interfacetable[-i][0] = NULL;
- }
- else {
- vftbl->interfacevftbllength[i] = ic->methodscount;
- vftbl->interfacetable[-i] = MNEW(methodptr, ic->methodscount);
-
-#ifdef STATISTICS
- count_vftbl_len += sizeof(methodptr) *
- (ic->methodscount + (ic->methodscount == 0));
#endif
- for (j=0; j<ic->methodscount; j++) {
- classinfo *sc = c;
- while (sc) {
- for (m = 0; m < sc->methodscount; m++) {
- methodinfo *mi = &(sc->methods[m]);
- if (method_canoverwrite(mi, &(ic->methods[j]))) {
- vftbl->interfacetable[-i][j] =
- vftbl->table[mi->vftblindex];
- goto foundmethod;
- }
- }
- sc = sc->super;
- }
- foundmethod: ;
- }
- }
-
- for (j = 0; j < ic->interfacescount; j++)
- class_addinterface(c, ic->interfaces[j]);
-}
-
-
-/******************* Function: class_new_array *********************************
-
- This function is called by class_new to setup an array class.
-
-*******************************************************************************/
-
-void class_new_array(classinfo *c)
-{
- classinfo *comp = NULL;
- methodinfo *clone;
- int namelen;
-
- /* Check array class name */
- 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]) {
- case '[':
- /* c is an array of arrays. We have to create the component class. */
- comp = class_new_int(utf_new_int(c->name->text + 1,namelen - 1));
- break;
-
- case 'L':
- /* c is an array of objects. */
- if (namelen < 4 || c->name->text[namelen - 1] != ';')
- panic("Invalid array class name");
- comp = class_new_int(utf_new_int(c->name->text + 2,namelen - 3));
- break;
- }
-
- /* Setup the array class */
- c->super = class_java_lang_Object;
- c->flags = ACC_PUBLIC | ACC_FINAL | ACC_ABSTRACT;
-
- c->interfacescount = 2;
- c->interfaces = MNEW(classinfo*, 2);
- c->interfaces[0] = class_new(utf_new_char("java/lang/Cloneable"));
- c->interfaces[1] = class_new(utf_new_char("java/io/Serializable"));
-
- c->methodscount = 1;
- c->methods = MNEW(methodinfo, c->methodscount);
-
- clone = c->methods;
- memset(clone, 0, sizeof(methodinfo));
- clone->flags = ACC_PUBLIC;
- clone->name = utf_new_char("clone");
- clone->descriptor = utf_new_char("()Ljava/lang/Object;");
- clone->class = c;
- clone->stubroutine = createnativestub((functionptr) &builtin_clone_array, clone);
- clone->monoPoly = MONO;
-
- /* XXX: field: length? */
-
- /* array classes are not loaded from class files */
- c->loaded = true;
-}
-
-
-/****************** Function: class_link_array *********************************
-
- This function is called by class_link to create the
- arraydescriptor for an array class.
-
- This function returns NULL if the array cannot be linked because
- the component type has not been linked yet.
-
-*******************************************************************************/
-
-static arraydescriptor *class_link_array(classinfo *c)
-{
- classinfo *comp = NULL;
- int namelen = c->name->blength;
- arraydescriptor *desc;
- vftbl *compvftbl;
-
- /* Check the component type */
- switch (c->name->text[1]) {
- case '[':
- /* c is an array of arrays. */
- comp = class_get(utf_new_int(c->name->text + 1, namelen - 1));
- if (!comp) panic("Could not find component array class.");
- break;
-
- case 'L':
- /* c is an array of objects. */
- comp = class_get(utf_new_int(c->name->text + 2, namelen - 3));
- if (!comp) panic("Could not find component class.");
- break;
- }
-
- /* If the component type has not been linked, link it now */
- if (comp && !comp->linked) {
- if (!comp->loaded)
- class_load(comp);
- class_link(comp);
- }
-
- /* Allocate the arraydescriptor */
- desc = NEW(arraydescriptor);
-
- if (comp) {
- /* c is an array of references */
- desc->arraytype = ARRAYTYPE_OBJECT;
- desc->componentsize = sizeof(void*);
- desc->dataoffset = OFFSET(java_objectarray,data);
-
- compvftbl = comp->vftbl;
- if (!compvftbl)
- panic("Component class has no vftbl");
- desc->componentvftbl = compvftbl;
+ /* parse the loaded descriptors */
+ for (i=0; i<c->cpcount; ++i) {
+ constant_FMIref *fmi;
+ int index;
- if (compvftbl->arraydesc) {
- desc->elementvftbl = compvftbl->arraydesc->elementvftbl;
- if (compvftbl->arraydesc->dimension >= 255)
- panic("Creating array of dimension >255");
- desc->dimension = compvftbl->arraydesc->dimension + 1;
- desc->elementtype = compvftbl->arraydesc->elementtype;
-
- } else {
- desc->elementvftbl = compvftbl;
- desc->dimension = 1;
- desc->elementtype = ARRAYTYPE_OBJECT;
- }
-
- } else {
- /* c is an array of a primitive type */
- switch (c->name->text[1]) {
- case 'Z':
- desc->arraytype = ARRAYTYPE_BOOLEAN;
- desc->dataoffset = OFFSET(java_booleanarray,data);
- desc->componentsize = sizeof(u1);
- break;
-
- case 'B':
- desc->arraytype = ARRAYTYPE_BYTE;
- desc->dataoffset = OFFSET(java_bytearray,data);
- desc->componentsize = sizeof(u1);
- break;
-
- case 'C':
- desc->arraytype = ARRAYTYPE_CHAR;
- desc->dataoffset = OFFSET(java_chararray,data);
- desc->componentsize = sizeof(u2);
- break;
-
- case 'D':
- desc->arraytype = ARRAYTYPE_DOUBLE;
- desc->dataoffset = OFFSET(java_doublearray,data);
- desc->componentsize = sizeof(double);
- break;
-
- case 'F':
- desc->arraytype = ARRAYTYPE_FLOAT;
- desc->dataoffset = OFFSET(java_floatarray,data);
- desc->componentsize = sizeof(float);
- break;
-
- case 'I':
- desc->arraytype = ARRAYTYPE_INT;
- desc->dataoffset = OFFSET(java_intarray,data);
- desc->componentsize = sizeof(s4);
- break;
-
- case 'J':
- desc->arraytype = ARRAYTYPE_LONG;
- desc->dataoffset = OFFSET(java_longarray,data);
- desc->componentsize = sizeof(s8);
- break;
-
- case 'S':
- desc->arraytype = ARRAYTYPE_SHORT;
- desc->dataoffset = OFFSET(java_shortarray,data);
- desc->componentsize = sizeof(s2);
- break;
-
- default:
- panic("Invalid array class name");
+ 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;
+ index = (int) (size_t) fmi->classref;
+ fmi->classref = descriptor_pool_lookup_classref(descpool,((classinfo *)class_getconstant(c,index,CONSTANT_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;
+ index = (int) (size_t) fmi->classref;
+ fmi->classref = descriptor_pool_lookup_classref(descpool,((classinfo *)class_getconstant(c,index,CONSTANT_Class))->name);
+ break;
}
-
- desc->componentvftbl = NULL;
- desc->elementvftbl = NULL;
- desc->dimension = 1;
- desc->elementtype = desc->arraytype;
}
-
- return desc;
-}
-
-
-/********************** Function: class_link ***********************************
-
- Tries to link a class. The function calculates the length in bytes that
- an instance of this class requires as well as the VTBL for methods and
- interface methods.
-
-*******************************************************************************/
-
-static classinfo *class_link_intern(classinfo *c);
-
-void class_link(classinfo *c)
-{
- classinfo *r;
- s8 starttime;
- s8 stoptime;
-
-#if defined(USE_THREADS)
-#if defined(NATIVE_THREADS)
- compiler_lock();
- tables_lock();
-#else
- intsDisable();
-#endif
-#endif
-
- /* maybe the class is already linked */
- if (c->linked) {
-#if defined(USE_THREADS)
-#if defined(NATIVE_THREADS)
- tables_unlock();
- compiler_unlock();
-#else
- intsRestore();
-#endif
-#endif
-
- return;
- }
-
- /* measure time */
- if (getloadingtime)
- starttime = getcputime();
-
- /* call the internal function */
- r = class_link_intern(c);
-
- /* if return value is NULL, we had a problem and the class is not linked */
- if (!r)
- c->linked = false;
-
- /* measure time */
- if (getloadingtime) {
- stoptime = getcputime();
- loadingtime += (stoptime - starttime);
+ for (i = 0; i < c->fieldscount; i++) {
+ c->fields[i].parseddesc = descriptor_pool_parse_field_descriptor(descpool,c->fields[i].descriptor);
+ if (!c->fields[i].parseddesc)
+ goto return_exception;
}
-
-#if defined(USE_THREADS)
-#if defined(NATIVE_THREADS)
- tables_unlock();
- compiler_unlock();
-#else
- intsRestore();
-#endif
-#endif
-}
-
-
-static classinfo *class_link_intern(classinfo *c)
-{
- s4 supervftbllength; /* vftbllegnth of super class */
- s4 vftbllength; /* vftbllength of current class */
- s4 interfacetablelength; /* interface table length */
- classinfo *super = c->super; /* super class */
- classinfo *ic, *c2; /* intermediate class variables */
- vftbl *v; /* vftbl of current class */
- s4 i; /* interface/method/field counter */
- arraydescriptor *arraydesc = NULL; /* descriptor for array classes */
-
- /* maybe the class is already linked */
- if (c->linked)
- return c;
-
- if (linkverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Linking class: ");
- utf_sprint_classname(logtext + strlen(logtext), c->name);
- log_text(logtext);
+ 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)
+ goto return_exception;
}
- /* ok, this class is somewhat linked */
- c->linked = true;
+ /* 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.
+ */
+ static int shift = 0;
+ u2 *hashtab;
+ u2 *next; /* for chaining colliding hash entries */
+ size_t len;
+ size_t hashlen;
+ u2 index;
+ u2 old;
- /* check interfaces */
+ /* Allocate hashtable */
+ len = c->methodscount;
+ if (len < c->fieldscount) len = c->fieldscount;
+ hashlen = 5 * len;
+ hashtab = MNEW(u2,(hashlen + len));
+ next = hashtab + hashlen;
- for (i = 0; i < c->interfacescount; i++) {
- ic = c->interfaces[i];
+ /* Determine bitshift (to get good hash values) */
+ if (!shift) {
+ len = sizeof(utf);
+ while (len) {
+ len >>= 1;
+ shift++;
+ }
+ }
- /* detect circularity */
- if (ic == c) {
- *exceptionptr =
- new_exception_utfmessage(string_java_lang_ClassCircularityError,
- c->name);
+ /* Check fields */
+ memset(hashtab, 0, sizeof(u2) * (hashlen + len));
- return NULL;
- }
+ for (i = 0; i < c->fieldscount; ++i) {
+ fieldinfo *fi = c->fields + i;
- if (!ic->loaded)
- class_load(ic);
+ /* It's ok if we lose bits here */
+ index = ((((size_t) fi->name) +
+ ((size_t) fi->descriptor)) >> shift) % hashlen;
- if (!ic->linked)
- class_link(ic);
+ if ((old = hashtab[index])) {
+ old--;
+ next[i] = old;
+ do {
+ if (c->fields[old].name == fi->name &&
+ c->fields[old].descriptor == fi->descriptor) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Repetitive field name/signature");
- if (!(ic->flags & ACC_INTERFACE)) {
- dolog("Specified interface is not declared as interface:");
- log_utf(ic->name);
- dolog("in");
- log_utf(c->name);
- panic("Specified interface is not declared as interface");
+ goto return_exception;
+ }
+ } while ((old = next[old]));
+ }
+ hashtab[index] = i + 1;
}
- }
-
- /* check super class */
-
- if (super == 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;
-
- c->finalizer = NULL;
-
- } else {
- /* detect circularity */
- if (super == c) {
- *exceptionptr =
- new_exception_utfmessage(string_java_lang_ClassCircularityError,
- c->name);
+ /* Check methods */
+ memset(hashtab, 0, sizeof(u2) * (hashlen + hashlen/5));
- return NULL;
- }
+ for (i = 0; i < c->methodscount; ++i) {
+ methodinfo *mi = c->methods + i;
- if (!super->loaded)
- class_load(super);
+ /* It's ok if we lose bits here */
+ index = ((((size_t) mi->name) +
+ ((size_t) mi->descriptor)) >> shift) % hashlen;
- if (!super->linked)
- class_link(super);
+ /*{ JOWENN
+ int dbg;
+ for (dbg=0;dbg<hashlen+hashlen/5;++dbg){
+ printf("Hash[%d]:%d\n",dbg,hashtab[dbg]);
+ }
+ }*/
- if (super->flags & ACC_INTERFACE)
- panic("Interface specified as super class");
+ if ((old = hashtab[index])) {
+ old--;
+ next[i] = old;
+ do {
+ if (c->methods[old].name == mi->name &&
+ c->methods[old].descriptor == mi->descriptor) {
+ *exceptionptr =
+ new_classformaterror(c,
+ "Repetitive method name/signature");
- /* handle array classes */
- /* The component class must have been linked already. */
- if (c->name->text[0] == '[') {
- if ((arraydesc = class_link_array(c)) == NULL) {
- panic("class_link: class_link_array");
+ goto return_exception;
+ }
+ } while ((old = next[old]));
}
+ hashtab[index] = i + 1;
}
-
- /* Don't allow extending final classes */
- if (super->flags & ACC_FINAL)
- panic("Trying to extend final class");
-
- if (c->flags & ACC_INTERFACE)
- c->index = interfaceindex++;
- else
- c->index = super->index + 1;
- c->instancesize = super->instancesize;
-
- vftbllength = supervftbllength = super->vftbl->vftbllength;
-
- c->finalizer = super->finalizer;
+ MFREE(hashtab, u2, (hashlen + len));
}
- /* compute vftbl length */
-
- for (i = 0; i < c->methodscount; i++) {
- methodinfo *m = &(c->methods[i]);
-
- if (!(m->flags & ACC_STATIC)) { /* is instance method */
- classinfo *sc = super;
- while (sc) {
- int j;
- for (j = 0; j < sc->methodscount; j++) {
- if (method_canoverwrite(m, &(sc->methods[j]))) {
- if ((sc->methods[j].flags & ACC_PRIVATE) != 0)
- goto notfoundvftblindex;
-
- if ((sc->methods[j].flags & ACC_FINAL) != 0) {
- log_utf(c->name);
- log_utf(sc->name);
- log_utf(sc->methods[j].name);
- log_utf(sc->methods[j].descriptor);
- panic("Trying to overwrite final method");
- }
- m->vftblindex = sc->methods[j].vftblindex;
- goto foundvftblindex;
- }
- }
- sc = sc->super;
- }
- notfoundvftblindex:
- m->vftblindex = (vftbllength++);
- foundvftblindex:
- ;
- }
- }
-
-#ifdef STATISTICS
- count_vftbl_len += sizeof(vftbl) + (sizeof(methodptr) * (vftbllength - 1));
-#endif
-
- /* compute interfacetable length */
-
- interfacetablelength = 0;
- c2 = c;
- while (c2) {
- for (i = 0; i < c2->interfacescount; i++) {
- s4 h = class_highestinterface(c2->interfaces[i]) + 1;
- if (h > interfacetablelength)
- interfacetablelength = h;
- }
- c2 = c2->super;
+#if defined(STATISTICS)
+ if (opt_stat) {
+ count_class_infos += sizeof(classinfo*) * c->interfacescount;
+ count_class_infos += sizeof(fieldinfo) * c->fieldscount;
+ count_class_infos += sizeof(methodinfo) * c->methodscount;
}
+#endif
- /* allocate virtual function table */
-
- v = (vftbl*) mem_alloc(sizeof(vftbl) + sizeof(methodptr) *
- (vftbllength - 1) + sizeof(methodptr*) *
- (interfacetablelength - (interfacetablelength > 0)));
- v = (vftbl*) (((methodptr*) v) + (interfacetablelength - 1) *
- (interfacetablelength > 1));
- c->header.vftbl = c->vftbl = v;
- v->class = c;
- v->vftbllength = vftbllength;
- v->interfacetablelength = interfacetablelength;
- v->arraydesc = arraydesc;
-
- /* store interface index in vftbl */
- if (c->flags & ACC_INTERFACE)
- v->baseval = -(c->index);
-
- /* copy virtual function table of super class */
+ /* load attribute structures */
+ if (!check_classbuffer_size(cb, 2))
+ goto return_exception;
- for (i = 0; i < supervftbllength; i++)
- v->table[i] = super->vftbl->table[i];
-
- /* add method stubs into virtual function table */
+ if (!load_attributes(cb, suck_u2(cb)))
+ goto return_exception;
- for (i = 0; i < c->methodscount; i++) {
- methodinfo *m = &(c->methods[i]);
- if (!(m->flags & ACC_STATIC)) {
- v->table[m->vftblindex] = m->stubroutine;
- }
- }
+#if 0
+ /* Pre java 1.5 version don't check this. This implementation is like
+ java 1.5 do it: for class file version 45.3 we don't check it, older
+ versions are checked.
+ */
+ if ((ma == 45 && mi > 3) || ma > 45) {
+ /* check if all data has been read */
+ s4 classdata_left = ((cb->data + cb->size) - cb->pos - 1);
- /* compute instance size and offset of each field */
-
- for (i = 0; i < c->fieldscount; i++) {
- s4 dsize;
- fieldinfo *f = &(c->fields[i]);
-
- if (!(f->flags & ACC_STATIC)) {
- dsize = desc_typesize(f->descriptor);
- c->instancesize = ALIGN(c->instancesize, dsize);
- f->offset = c->instancesize;
- c->instancesize += dsize;
+ if (classdata_left > 0) {
+ *exceptionptr =
+ new_classformaterror(c, "Extra bytes at the end of class file");
+ goto return_exception;
}
}
+#endif
- /* initialize interfacetable and interfacevftbllength */
+ /* release dump area */
+ dump_release(dumpsize);
- v->interfacevftbllength = MNEW(s4, interfacetablelength);
+ if (loadverbose)
+ log_message_class("Loading done class: ", c);
-#ifdef STATISTICS
- count_vftbl_len += (4 + sizeof(s4)) * v->interfacetablelength;
-#endif
+ return c;
- for (i = 0; i < interfacetablelength; i++) {
- v->interfacevftbllength[i] = 0;
- v->interfacetable[-i] = NULL;
- }
-
- /* add interfaces */
-
- for (c2 = c; c2 != NULL; c2 = c2->super)
- for (i = 0; i < c2->interfacescount; i++) {
- class_addinterface(c, c2->interfaces[i]);
- }
+return_exception:
+ /* release dump area */
+ dump_release(dumpsize);
- /* add finalizer method (not for java.lang.Object) */
+ /* an exception has been thrown */
+ return NULL;
+}
- if (super != NULL) {
- methodinfo *fi;
- static utf *finame = NULL;
- static utf *fidesc = NULL;
- if (finame == NULL)
- finame = utf_finalize;
- if (fidesc == NULL)
- fidesc = utf_fidesc;
- fi = class_findmethod(c, finame, fidesc);
- if (fi != NULL) {
- if (!(fi->flags & ACC_STATIC)) {
- c->finalizer = fi;
- }
- }
- }
+/******************* Function: class_new_array *********************************
- /* final tasks */
+ This function is called by class_new to setup an array class.
- loader_compute_subclasses(c);
+*******************************************************************************/
- /* just return c to show that we don't had a problem */
+void class_new_array(classinfo *c)
+{
+ classinfo *comp = NULL;
+ methodinfo *clone;
+ methoddesc *clonedesc;
+ constant_classref *classrefs;
+ int namelen;
- return c;
-}
+ /* Check array class name */
+ 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]) {
+ 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);
-/******************* Function: class_freepool **********************************
+ } else {
+ comp = class_new(utf_new_intern(c->name->text + 1, namelen - 1));
+ }
+ break;
- Frees all resources used by this classes Constant Pool.
+ 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);
-static void class_freecpool (classinfo *c)
-{
- u4 idx;
- u4 tag;
- voidptr info;
-
- for (idx=0; idx < c->cpcount; idx++) {
- tag = c->cptags[idx];
- info = c->cpinfos[idx];
-
- if (info != NULL) {
- switch (tag) {
- case CONSTANT_Fieldref:
- case CONSTANT_Methodref:
- case CONSTANT_InterfaceMethodref:
- FREE (info, constant_FMIref);
- break;
- case CONSTANT_Integer:
- FREE (info, constant_integer);
- break;
- case CONSTANT_Float:
- FREE (info, constant_float);
- break;
- case CONSTANT_Long:
- FREE (info, constant_long);
- break;
- case CONSTANT_Double:
- FREE (info, constant_double);
- break;
- case CONSTANT_NameAndType:
- FREE (info, constant_nameandtype);
- break;
- }
- }
+ } else {
+ comp = class_new(utf_new_intern(c->name->text + 2, namelen - 3));
}
+ break;
+ }
- MFREE (c -> cptags, u1, c -> cpcount);
- MFREE (c -> cpinfos, voidptr, c -> cpcount);
-}
+ /* Setup the array class */
+ c->super.cls = class_java_lang_Object;
+ c->flags = ACC_PUBLIC | ACC_FINAL | ACC_ABSTRACT;
+ c->interfacescount = 2;
+ c->interfaces = MNEW(classref_or_classinfo, 2);
-/*********************** Function: class_free **********************************
+ if (opt_eager) {
+ classinfo *tc;
- Frees all resources used by the class.
+ tc = class_java_lang_Cloneable;
+ load_class_bootstrap(tc);
+ list_addfirst(&unlinkedclasses, tc);
+ c->interfaces[0].cls = tc;
-*******************************************************************************/
+ tc = class_java_io_Serializable;
+ load_class_bootstrap(tc);
+ list_addfirst(&unlinkedclasses, tc);
+ c->interfaces[1].cls = tc;
-static void class_free(classinfo *c)
-{
- s4 i;
- vftbl *v;
-
- class_freecpool(c);
+ } else {
+ c->interfaces[0].cls = class_java_lang_Cloneable;
+ c->interfaces[1].cls = class_java_io_Serializable;
+ }
- MFREE(c->interfaces, classinfo*, c->interfacescount);
+ c->methodscount = 1;
+ c->methods = MNEW(methodinfo, c->methodscount);
- for (i = 0; i < c->fieldscount; i++)
- field_free(&(c->fields[i]));
-
- for (i = 0; i < c->methodscount; i++)
- method_free(&(c->methods[i]));
- MFREE(c->methods, methodinfo, c->methodscount);
+ classrefs = MNEW(constant_classref,1);
+ CLASSREF_INIT(classrefs[0],c,utf_java_lang_Object);
- if ((v = c->vftbl) != NULL) {
- if (v->arraydesc)
- mem_free(v->arraydesc,sizeof(arraydescriptor));
-
- for (i = 0; i < v->interfacetablelength; i++) {
- MFREE(v->interfacetable[-i], methodptr, v->interfacevftbllength[i]);
- }
- MFREE(v->interfacevftbllength, s4, v->interfacetablelength);
+ clonedesc = NEW(methoddesc);
+ clonedesc->returntype.type = TYPE_ADDRESS;
+ clonedesc->returntype.classref = classrefs;
+ clonedesc->returntype.arraydim = 0;
+ clonedesc->paramcount = 0;
+ clonedesc->paramslots = 0;
- i = sizeof(vftbl) + sizeof(methodptr) * (v->vftbllength - 1) +
- sizeof(methodptr*) * (v->interfacetablelength -
- (v->interfacetablelength > 0));
- v = (vftbl*) (((methodptr*) v) - (v->interfacetablelength - 1) *
- (v->interfacetablelength > 1));
- mem_free(v, i);
- }
+ clone = c->methods;
+ MSET(clone, 0, methodinfo, 1);
+ clone->flags = ACC_PUBLIC;
+ clone->name = utf_new_char("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;
- if (c->innerclasscount)
- MFREE(c->innerclass, innerclassinfo, c->innerclasscount);
+ /* XXX: field: length? */
- /* if (c->classvftbl)
- mem_free(c->header.vftbl, sizeof(vftbl) + sizeof(methodptr)*(c->vftbl->vftbllength-1)); */
-
- GCFREE(c);
+ /* array classes are not loaded from class files */
+ c->loaded = true;
+ c->parseddescs = (u1*) clonedesc;
+ c->parseddescsize = sizeof(methodinfo);
+ c->classrefs = classrefs;
+ c->classrefcount = 1;
+
+ /* XXX insert class into the loaded class cache */
}
static fieldinfo *class_resolvefield_int(classinfo *c, utf *name, utf *desc)
{
- s4 i;
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], name, desc);
+
+ 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)
- return class_resolvefield_int(c->super, name, desc);
+
+ if (c->super.cls)
+ return class_resolvefield_int(c->super.cls, name, desc);
/* not found */
+
return NULL;
}
if (!fi) {
if (except)
- *exceptionptr = new_exception("java/lang/NoSuchFieldError");
+ *exceptionptr =
+ new_exception_utfmessage(string_java_lang_NoSuchFieldError,
+ name);
+
return NULL;
}
}
-/************************* Function: class_findmethod **************************
+/* class_findmethod ************************************************************
- Searches a 'classinfo' structure for a method having the given name and
- type and returns the index in the class info structure.
- If type is NULL, it is ignored.
+ Searches a 'classinfo' structure for a method having the given name
+ and descriptor. If descriptor is NULL, it is ignored.
*******************************************************************************/
-s4 class_findmethodIndex(classinfo *c, utf *name, utf *desc)
+methodinfo *class_findmethod(classinfo *c, utf *name, utf *desc)
{
+ methodinfo *m;
s4 i;
for (i = 0; i < c->methodscount; i++) {
- if ((c->methods[i].name == name) && ((desc == NULL) ||
- (c->methods[i].descriptor == desc))) {
- return i;
- }
- }
-
- return -1;
-}
-
-
-/************************* Function: class_findmethod **************************
-
- Searches a 'classinfo' structure for a method having the given name and
- type.
- If type is NULL, it is ignored.
-
-*******************************************************************************/
-
-methodinfo *class_findmethod(classinfo *c, utf *name, utf *desc)
-{
- s4 idx = class_findmethodIndex(c, name, desc);
+ m = &(c->methods[i]);
- if (idx == -1)
- return NULL;
+ if ((m->name == name) && ((desc == NULL) || (m->descriptor == desc)))
+ return m;
+ }
- return &(c->methods[idx]);
+ return NULL;
}
}
-/*********************** Function: class_findmethod_w**************************
-
- like class_findmethod, but logs a warning if the method is not found
-
-*******************************************************************************/
-
-methodinfo *class_findmethod_w(classinfo *c, utf *name, utf *desc, char *from)
-{
- 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();
-
- if ( c->flags & ACC_PUBLIC ) log_plain(" PUBLIC ");
- if ( c->flags & ACC_PRIVATE ) log_plain(" PRIVATE ");
- if ( c->flags & ACC_PROTECTED ) log_plain(" PROTECTED ");
- if ( c->flags & ACC_STATIC ) log_plain(" STATIC ");
- if ( c->flags & ACC_FINAL ) log_plain(" FINAL ");
- if ( c->flags & ACC_SYNCHRONIZED ) log_plain(" SYNCHRONIZED ");
- if ( c->flags & ACC_VOLATILE ) log_plain(" VOLATILE ");
- if ( c->flags & ACC_TRANSIENT ) log_plain(" TRANSIENT ");
- if ( c->flags & ACC_NATIVE ) log_plain(" NATIVE ");
- if ( c->flags & ACC_INTERFACE ) log_plain(" INTERFACE ");
- if ( c->flags & ACC_ABSTRACT ) log_plain(" ABSTRACT ");
-
- log_plain(from);
- log_plain(" : WARNING: Method not found");log_nl( );
- }
-
- return mi;
-}
-
-
/************************* Function: class_findmethod_approx ******************
like class_findmethod but ignores the return value when comparing the
/* method found */
if (m) return m;
/* search superclass */
- c = c->super;
+ c = c->super.cls;
}
return NULL;
}
-/************************* Function: class_resolvemethod ***********************
+/* class_resolvemethod *********************************************************
- Searches a class and every super class for a method.
+ Searches a class and it's super classes for a method.
*******************************************************************************/
methodinfo *class_resolvemethod(classinfo *c, utf *name, utf *desc)
{
+ methodinfo *m;
+
while (c) {
- methodinfo *m = class_findmethod(c, name, desc);
- if (m) return m;
- /* search superclass */
- c = c->super;
+ m = class_findmethod(c, name, desc);
+
+ if (m)
+ return m;
+
+ c = c->super.cls;
}
return NULL;
}
-/****************** Function: class_resolveinterfacemethod_int ****************
+/* class_resolveinterfacemethod_intern *****************************************
- Internally used helper function. Do not use this directly.
+ Internally used helper function. Do not use this directly.
*******************************************************************************/
-static
-methodinfo *class_resolveinterfacemethod_int(classinfo *c, utf *name, utf *desc)
+static methodinfo *class_resolveinterfacemethod_intern(classinfo *c,
+ utf *name, utf *desc)
{
- methodinfo *mi;
- int i;
+ methodinfo *m;
+ s4 i;
- mi = class_findmethod(c,name,desc);
- if (mi)
- return mi;
+ m = class_findmethod(c, name, desc);
+
+ if (m)
+ return m;
/* try the superinterfaces */
- for (i=0; i<c->interfacescount; ++i) {
- mi = class_resolveinterfacemethod_int(c->interfaces[i],name,desc);
- if (mi)
- return mi;
+
+ for (i = 0; i < c->interfacescount; i++) {
+ m = class_resolveinterfacemethod_intern(c->interfaces[i].cls, name, desc);
+
+ if (m)
+ return m;
}
return NULL;
}
-/******************** Function: class_resolveinterfacemethod ******************
+/* class_resolveinterfacemethod ************************************************
- Resolves a reference from REFERER to a method with NAME and DESC in
- interface C.
+ 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.
+ If the method cannot be resolved the return value is NULL. If
+ EXCEPT is true *exceptionptr is set, too.
*******************************************************************************/
/* XXX resolve class c */
/* XXX check access from REFERER to C */
- if ((c->flags & ACC_INTERFACE) == 0) {
+ if (!(c->flags & ACC_INTERFACE)) {
if (except)
- *exceptionptr = new_exception("java/lang/IncompatibleClassChangeError");
+ *exceptionptr =
+ new_exception(string_java_lang_IncompatibleClassChangeError);
+
return NULL;
}
- mi = class_resolveinterfacemethod_int(c, name, desc);
+ 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);
+ mi = class_findmethod(class_java_lang_Object, name, desc);
if (mi)
return mi;
if (except)
- *exceptionptr = new_exception_utfmessage("java/lang/NoSuchMethodError",
- name);
+ *exceptionptr =
+ new_exception_utfmessage(string_java_lang_NoSuchMethodError, name);
+
return NULL;
}
-/********************* Function: class_resolveclassmethod *********************
+
+/* class_resolveclassmethod ****************************************************
Resolves a reference from REFERER to a method with NAME and DESC in
class C.
methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *desc,
classinfo *referer, bool except)
{
- classinfo *cls;
+ classinfo *cls;
methodinfo *mi;
- s4 i;
-
+ s4 i;
+ char *msg;
+ s4 msglen;
+
/* XXX resolve class c */
/* XXX check access from REFERER to C */
-
- if ((c->flags & ACC_INTERFACE) != 0) {
- if (except)
- *exceptionptr =
- new_exception("java/lang/IncompatibleClassChangeError");
- return NULL;
- }
+
+/* if (c->flags & ACC_INTERFACE) { */
+/* if (except) */
+/* *exceptionptr = */
+/* new_exception(string_java_lang_IncompatibleClassChangeError); */
+/* return NULL; */
+/* } */
/* try class c and its superclasses */
+
cls = c;
- do {
+
+ while (cls) {
mi = class_findmethod(cls, name, desc);
+
if (mi)
goto found;
- } while ((cls = cls->super) != NULL); /* try the superclass */
+
+ cls = cls->super.cls;
+ }
/* try the superinterfaces */
- for (i = 0; i < c->interfacescount; ++i) {
- mi = class_resolveinterfacemethod_int(c->interfaces[i], name, desc);
+
+ for (i = 0; i < c->interfacescount; i++) {
+ mi = class_resolveinterfacemethod_intern(c->interfaces[i].cls, name, desc);
+
if (mi)
goto found;
}
- if (except)
- *exceptionptr = new_exception_utfmessage("java/lang/NoSuchMethodError",
- name);
+ 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) != 0 && (c->flags & ACC_ABSTRACT) == 0) {
+ if ((mi->flags & ACC_ABSTRACT) && !(c->flags & ACC_ABSTRACT)) {
if (except)
- *exceptionptr = new_exception("java/lang/AbstractMethodError");
+ *exceptionptr = new_exception(string_java_lang_AbstractMethodError);
+
return NULL;
}
for (;;) {
if (!sub) return false;
if (sub == super) return true;
- sub = sub->super;
+ sub = sub->super.cls;
}
}
*******************************************************************************/
+static classinfo *class_init_intern(classinfo *c);
+
classinfo *class_init(classinfo *c)
{
- methodinfo *m;
- s4 i;
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
- int b;
-#endif
+ classinfo *r;
if (!makeinitializations)
return c;
- if (c->initialized)
+#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;
+}
- /* class is somewhat initialized */
- c->initialized = true;
+/* 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)
- class_load(c);
+ if (!load_class_bootstrap(c))
+ return NULL;
+ /* maybe the class is not already linked */
if (!c->linked)
- class_link(c);
-
-#ifdef STATISTICS
+ if (!link_class(c))
+ return NULL;
- count_class_inits++;
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_class_inits++;
#endif
/* initialize super class */
- if (c->super) {
- if (!c->super->loaded)
- class_load(c->super);
- if (!c->super->linked)
- class_link(c->super);
+ if (c->super.cls) {
+ if (!c->super.cls->initialized) {
+ if (initverbose) {
+ char logtext[MAXLOGTEXT];
+ sprintf(logtext, "Initialize super class ");
+ utf_sprint_classname(logtext + strlen(logtext), c->super.cls->name);
+ sprintf(logtext + strlen(logtext), " from ");
+ utf_sprint_classname(logtext + strlen(logtext), c->name);
+ log_text(logtext);
+ }
- 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.cls))
+ return NULL;
}
-
- (void) class_init(c->super);
}
/* initialize interface classes */
- for (i = 0; i < c->interfacescount; i++) {
- if (!c->interfaces[i]->loaded)
- class_load(c->interfaces[i]);
-
- if (!c->interfaces[i]->linked)
- class_link(c->interfaces[i]);
- 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);
+ for (i = 0; i < c->interfacescount; i++) {
+ if (!c->interfaces[i].cls->initialized) {
+ if (initverbose) {
+ char logtext[MAXLOGTEXT];
+ sprintf(logtext, "Initialize interface class ");
+ utf_sprint_classname(logtext + strlen(logtext), c->interfaces[i].cls->name);
+ sprintf(logtext + strlen(logtext), " from ");
+ utf_sprint_classname(logtext + strlen(logtext), c->name);
+ log_text(logtext);
+ }
+
+ if (!class_init(c->interfaces[i].cls))
+ return NULL;
}
-
- (void) class_init(c->interfaces[i]);
}
- m = class_findmethod(c, utf_clinit, utf_fidesc);
+ m = class_findmethod(c, utf_clinit, utf_void__void);
if (!m) {
if (initverbose) {
return c;
}
- if (!(m->flags & ACC_STATIC))
- panic("Class initializer is not static!");
+ /* 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) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Starting static class initializer for class: ");
- utf_sprint_classname(logtext + strlen(logtext), c->name);
- log_text(logtext);
- }
+ if (initverbose)
+ log_message_class("Starting static class initializer for class: ", c);
#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
b = blockInts;
blockInts = b;
#endif
- /* we have an exception */
+ /* we have an exception or error */
if (*exceptionptr) {
- java_objectheader *xptr;
- java_objectheader *cause;
-
/* class is NOT initialized */
c->initialized = false;
- /* get the cause */
- cause = *exceptionptr;
+ /* is this an exception, than wrap it */
+ if (builtin_instanceof(*exceptionptr, class_java_lang_Exception)) {
+ java_objectheader *xptr;
+ java_objectheader *cause;
- /* clear exception, because we are calling jit code again */
- *exceptionptr = NULL;
+ /* get the cause */
+ cause = *exceptionptr;
- /* wrap the exception */
- xptr = new_exception_throwable("java/lang/ExceptionInInitializerError",
- (java_lang_Throwable *) cause);
+ /* clear exception, because we are calling jit code again */
+ *exceptionptr = NULL;
- if (*exceptionptr) {
- panic("problem");
- }
+ /* wrap the exception */
+ xptr =
+ new_exception_throwable(string_java_lang_ExceptionInInitializerError,
+ (java_lang_Throwable *) cause);
- /* set new exception */
- *exceptionptr = xptr;
+ /* XXX should we exit here? */
+ if (*exceptionptr)
+ throw_exception();
+
+ /* set new exception */
+ *exceptionptr = xptr;
+ }
return NULL;
}
- if (initverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Finished static class initializer for class: ");
- utf_sprint_classname(logtext + strlen(logtext), c->name);
- log_text(logtext);
- }
+ if (initverbose)
+ log_message_class("Finished static class initializer for class: ", c);
return c;
}
-/********* Function: find_class_method_constant *********/
-
-int find_class_method_constant (classinfo *c, utf * c1, utf* m1, utf* d1)
-{
- u4 i;
- voidptr e;
-
- for (i=0; i<c->cpcount; i++) {
-
- e = c -> cpinfos [i];
- if (e) {
-
- switch (c -> cptags [i]) {
- case CONSTANT_Methodref:
- {
- constant_FMIref *fmi = e;
- if ( (fmi->class->name == c1)
- && (fmi->name == m1)
- && (fmi->descriptor == d1)) {
-
- return i;
- }
- }
- break;
-
- case CONSTANT_InterfaceMethodref:
- {
- constant_FMIref *fmi = e;
- if ( (fmi->class->name == c1)
- && (fmi->name == m1)
- && (fmi->descriptor == d1)) {
-
- return i;
- }
- }
- break;
- }
- }
- }
-
- return -1;
-}
-
-
void class_showconstanti(classinfo *c, int ii)
{
u4 i = ii;
displayFMIi:
{
constant_FMIref *fmi = e;
- utf_display(fmi->class->name);
+ utf_display(fmi->classref->name);
printf(".");
utf_display(fmi->name);
printf(" ");
displayFMI:
{
constant_FMIref *fmi = e;
- utf_display ( fmi->class->name );
+ utf_display ( fmi->classref->name );
printf (".");
utf_display ( fmi->name);
printf (" ");
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 *******************/
/******************************************************************************/
-/**************** function: create_primitive_classes ***************************
-
- create classes representing primitive types
-
-*******************************************************************************/
-
-void create_primitive_classes()
-{
- int i;
-
- for (i = 0; i < PRIMITIVETYPE_COUNT; i++) {
- /* create primitive class */
- classinfo *c = class_new_int(utf_new_char(primitivetype_table[i].name));
- c->classUsed = NOTUSED; /* not used initially CO-RT */
- c->impldBy = NULL;
-
- /* prevent loader from loading primitive class */
- c->loaded = true;
- class_link(c);
-
- primitivetype_table[i].class_primitive = c;
-
- /* create class for wrapping the primitive type */
- c = class_new_int(utf_new_char(primitivetype_table[i].wrapname));
- 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 */
- if (primitivetype_table[i].arrayname) {
- c = class_new_int(utf_new_char(primitivetype_table[i].arrayname));
- primitivetype_table[i].arrayclass = c;
- c->loaded = true;
- if (!c->linked)
- class_link(c);
- primitivetype_table[i].arrayvftbl = c->vftbl;
- }
- }
-}
-
-
-/**************** function: class_primitive_from_sig ***************************
-
- return the primitive class indicated by the given signature character
-
- If the descriptor does not indicate a valid primitive type the
- return value is NULL.
-
-********************************************************************************/
-
-classinfo *class_primitive_from_sig(char sig)
-{
- switch (sig) {
- case 'I': return primitivetype_table[PRIMITIVETYPE_INT].class_primitive;
- case 'J': return primitivetype_table[PRIMITIVETYPE_LONG].class_primitive;
- case 'F': return primitivetype_table[PRIMITIVETYPE_FLOAT].class_primitive;
- case 'D': return primitivetype_table[PRIMITIVETYPE_DOUBLE].class_primitive;
- case 'B': return primitivetype_table[PRIMITIVETYPE_BYTE].class_primitive;
- case 'C': return primitivetype_table[PRIMITIVETYPE_CHAR].class_primitive;
- case 'S': return primitivetype_table[PRIMITIVETYPE_SHORT].class_primitive;
- case 'Z': return primitivetype_table[PRIMITIVETYPE_BOOLEAN].class_primitive;
- case 'V': return primitivetype_table[PRIMITIVETYPE_VOID].class_primitive;
- }
- return NULL;
-}
-
-/****************** function: class_from_descriptor ****************************
-
- return the class indicated by the given descriptor
-
- utf_ptr....first character of descriptor
- end_ptr....first character after the end of the string
- next.......if non-NULL, *next is set to the first character after
- the descriptor. (Undefined if an error occurs.)
-
- mode.......a combination (binary or) of the following flags:
-
- (Flags marked with * are the default settings.)
-
- What to do if a reference type descriptor is parsed successfully:
-
- CLASSLOAD_SKIP...skip it and return something != NULL
- * CLASSLOAD_NEW....get classinfo * via class_new
- CLASSLOAD_LOAD...get classinfo * via loader_load
-
- How to handle primitive types:
-
- * CLASSLOAD_PRIMITIVE.......return primitive class (eg. "int")
- CLASSLOAD_NULLPRIMITIVE...return NULL for primitive types
-
- How to handle "V" descriptors:
-
- * CLASSLOAD_VOID.....handle it like other primitive types
- CLASSLOAD_NOVOID...treat it as an error
-
- How to deal with extra characters after the end of the
- descriptor:
-
- * CLASSLOAD_NOCHECKEND...ignore (useful for parameter lists)
- CLASSLOAD_CHECKEND.....treat them as an error
-
- How to deal with errors:
-
- * CLASSLOAD_PANIC....abort execution with an error message
- CLASSLOAD_NOPANIC..return NULL on error
-
-********************************************************************************/
-
-classinfo *class_from_descriptor(char *utf_ptr, char *end_ptr,
- char **next, int mode)
-{
- char *start = utf_ptr;
- bool error = false;
- utf *name;
-
- SKIP_FIELDDESCRIPTOR_SAFE(utf_ptr, end_ptr, error);
-
- if (mode & CLASSLOAD_CHECKEND)
- error |= (utf_ptr != end_ptr);
-
- if (!error) {
- if (next) *next = utf_ptr;
-
- switch (*start) {
- case 'V':
- if (mode & CLASSLOAD_NOVOID)
- break;
- /* FALLTHROUGH! */
- case 'I':
- case 'J':
- case 'F':
- case 'D':
- case 'B':
- case 'C':
- case 'S':
- case 'Z':
- return (mode & CLASSLOAD_NULLPRIMITIVE)
- ? NULL
- : class_primitive_from_sig(*start);
-
- case 'L':
- start++;
- utf_ptr--;
- /* FALLTHROUGH! */
- case '[':
- if (mode & CLASSLOAD_SKIP) return class_java_lang_Object;
- name = utf_new(start, utf_ptr - start);
- return (mode & CLASSLOAD_LOAD)
- ? class_load(class_new(name)) : class_new(name); /* XXX handle errors */
- }
- }
-
- /* An error occurred */
- if (mode & CLASSLOAD_NOPANIC)
- return NULL;
-
- log_plain("Invalid descriptor at beginning of '");
- log_plain_utf(utf_new(start, end_ptr - start));
- log_plain("'");
- log_nl();
-
- panic("Invalid descriptor");
-
- /* keep compiler happy */
- return NULL;
-}
-
-
-/******************* function: type_from_descriptor ****************************
-
- return the basic type indicated by the given descriptor
-
- This function parses a descriptor and returns its basic type as
- TYPE_INT, TYPE_LONG, TYPE_FLOAT, TYPE_DOUBLE, TYPE_ADDRESS or TYPE_VOID.
-
- cls...if non-NULL the referenced variable is set to the classinfo *
- returned by class_from_descriptor.
-
- For documentation of the arguments utf_ptr, end_ptr, next and mode
- see class_from_descriptor. The only difference is that
- type_from_descriptor always uses CLASSLOAD_PANIC.
-
-********************************************************************************/
-
-int type_from_descriptor(classinfo **cls, char *utf_ptr, char *end_ptr,
- char **next, int mode)
-{
- classinfo *mycls;
- if (!cls) cls = &mycls;
- *cls = class_from_descriptor(utf_ptr, end_ptr, next, mode & (~CLASSLOAD_NOPANIC));
- switch (*utf_ptr) {
- case 'B':
- case 'C':
- case 'I':
- case 'S':
- case 'Z':
- return TYPE_INT;
- case 'D':
- return TYPE_DOUBLE;
- case 'F':
- return TYPE_FLOAT;
- case 'J':
- return TYPE_LONG;
- case 'V':
- return TYPE_VOID;
- }
- return TYPE_ADDRESS;
-}
-
-
-/*************** function: create_pseudo_classes *******************************
-
- create pseudo classes used by the typechecker
-
-********************************************************************************/
-
-static void create_pseudo_classes()
-{
- /* pseudo class for Arraystubs (extends java.lang.Object) */
-
- pseudo_class_Arraystub = class_new_int(utf_new_char("$ARRAYSTUB$"));
-/* list_remove(&unloadedclasses, pseudo_class_Arraystub); */
- pseudo_class_Arraystub->loaded = true;
-
- pseudo_class_Arraystub->super = class_java_lang_Object;
- pseudo_class_Arraystub->interfacescount = 2;
- pseudo_class_Arraystub->interfaces = MNEW(classinfo*, 2);
- pseudo_class_Arraystub->interfaces[0] = class_java_lang_Cloneable;
- pseudo_class_Arraystub->interfaces[1] = class_java_io_Serializable;
-
-/* list_addlast(&unlinkedclasses, pseudo_class_Arraystub); */
- class_link(pseudo_class_Arraystub);
-
- pseudo_class_Arraystub_vftbl = pseudo_class_Arraystub->vftbl;
-
- /* pseudo class representing the null type */
-
- pseudo_class_Null = class_new_int(utf_new_char("$NULL$"));
-/* list_remove(&unloadedclasses, pseudo_class_Null); */
- pseudo_class_Null->loaded = true;
-
- pseudo_class_Null->super = class_java_lang_Object;
-
-/* list_addlast(&unlinkedclasses, pseudo_class_Null); */
- class_link(pseudo_class_Null);
-
- /* pseudo class representing new uninitialized objects */
-
- pseudo_class_New = class_new_int(utf_new_char("$NEW$"));
-/* list_remove(&unloadedclasses, pseudo_class_New); */
- pseudo_class_New->linked = true;
-
- pseudo_class_New->super = class_java_lang_Object;
-
-/* list_addlast(&unlinkedclasses, pseudo_class_New); */
- class_link(pseudo_class_New);
-}
-
-
-/********************** Function: loader_init **********************************
-
- Initializes all lists and loads all classes required for the system or the
- compiler.
-
-*******************************************************************************/
-
-void loader_init(u1 *stackbottom)
-{
- interfaceindex = 0;
-
- /* create utf-symbols for pointer comparison of frequently used strings */
- utf_innerclasses = utf_new_char("InnerClasses");
- utf_constantvalue = utf_new_char("ConstantValue");
- utf_code = utf_new_char("Code");
- utf_exceptions = utf_new_char("Exceptions");
- utf_linenumbertable = utf_new_char("LineNumberTable");
- utf_sourcefile = utf_new_char("SourceFile");
- utf_finalize = utf_new_char("finalize");
- utf_fidesc = utf_new_char("()V");
- utf_init = utf_new_char("<init>");
- utf_clinit = utf_new_char("<clinit>");
- utf_initsystemclass = utf_new_char("initializeSystemClass");
- utf_systemclass = utf_new_char("java/lang/System");
- utf_vmclassloader = utf_new_char("java/lang/VMClassLoader");
- utf_initialize = utf_new_char("initialize");
- utf_initializedesc = utf_new_char("(I)V");
-
- utf_vmclass = utf_new_char("java/lang/VMClass");
- utf_java_lang_Object= utf_new_char("java/lang/Object");
-
- array_packagename = utf_new_char("<the array package>");
-
- /* create some important classes */
- /* These classes have to be created now because the classinfo
- * pointers are used in the loading code.
- */
- class_java_lang_Object =
- class_new_int(utf_java_lang_Object);
- class_load(class_java_lang_Object);
- class_link(class_java_lang_Object);
-
- class_java_lang_String =
- class_new_int(utf_new_char("java/lang/String"));
- class_load(class_java_lang_String);
- class_link(class_java_lang_String);
-
- class_java_lang_Cloneable =
- class_new_int(utf_new_char("java/lang/Cloneable"));
- class_load(class_java_lang_Cloneable);
- class_link(class_java_lang_Cloneable);
-
- class_java_io_Serializable =
- class_new_int(utf_new_char("java/io/Serializable"));
- class_load(class_java_io_Serializable);
- class_link(class_java_io_Serializable);
-
- class_java_lang_Throwable =
- class_new(utf_new_char("java/lang/Throwable"));
- class_load(class_java_lang_Throwable);
- class_link(class_java_lang_Throwable);
-
- /* create classes representing primitive types */
- create_primitive_classes();
-
- /* create classes used by the typechecker */
- create_pseudo_classes();
-
- /* correct vftbl-entries (retarded loading of class java/lang/String) */
- stringtable_update();
-
-#if defined(USE_THREADS)
- if (stackbottom != 0)
- initLocks();
-#endif
-}
-
-
-static void loader_compute_class_values(classinfo *c)
-{
- classinfo *subs;
-
- c->vftbl->baseval = ++classvalue;
-
- subs = c->sub;
- while (subs != NULL) {
- loader_compute_class_values(subs);
- subs = subs->nextsub;
- }
-
- c->vftbl->diffval = classvalue - c->vftbl->baseval;
-}
-
-
-void loader_compute_subclasses(classinfo *c)
-{
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
- intsDisable();
-#endif
-
- if (!(c->flags & ACC_INTERFACE)) {
- c->nextsub = 0;
- c->sub = 0;
- }
-
- if (!(c->flags & ACC_INTERFACE) && (c->super != NULL)) {
- c->nextsub = c->super->sub;
- c->super->sub = c;
- }
-
- classvalue = 0;
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- cast_lock();
-#endif
-
- /* this is the java.lang.Object special case */
- if (!class_java_lang_Object) {
- loader_compute_class_values(c);
-
- } else {
- loader_compute_class_values(class_java_lang_Object);
- }
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- cast_unlock();
-#endif
-
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
- intsRestore();
-#endif
-}
-
-
/******************** Function: loader_close ***********************************
Frees all resources
void loader_close()
{
-/* classinfo *c; */
+ classinfo *c;
+ s4 slot;
-/* while ((c = list_first(&unloadedclasses))) { */
-/* list_remove(&unloadedclasses, c); */
-/* class_free(c); */
-/* } */
-/* while ((c = list_first(&unlinkedclasses))) { */
-/* list_remove(&unlinkedclasses, c); */
-/* class_free(c); */
-/* } */
-/* while ((c = list_first(&linkedclasses))) { */
-/* list_remove(&linkedclasses, c); */
-/* class_free(c); */
-/* } */
+ for (slot = 0; slot < class_hash.size; slot++) {
+ c = class_hash.ptr[slot];
+
+ while (c) {
+ class_free(c);
+ c = c->hashlink;
+ }
+ }
}
projects / cacao.git / blobdiff