This commit introduces C++ support.

[cacao.git] / src / vmcore / loader.c

diff --git a/src/vmcore/loader.c b/src/vmcore/loader.c
index 6ab5036d36a2e3be509fc05fe9474f9dba0ac73f..c303485d056611d5a8bd2e4d7b3103a0e5f530a2 100644 (file)
--- a/src/vmcore/loader.c
+++ b/src/vmcore/loader.c
@@ -43,7 +43,7 @@
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
-#include "vm/package.h"
+#include "vm/package.hpp"
 #include "vm/primitive.h"
 #include "vm/resolve.h"
 #include "vm/stringlocal.h"
@@ -186,7 +186,7 @@ void loader_init(void)
 
        class_java_lang_Throwable  = load_class_bootstrap(utf_java_lang_Throwable);
 
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
        class_java_lang_VMSystem   =
                load_class_bootstrap(utf_new_char("java/lang/VMSystem"));
 
@@ -197,30 +197,37 @@ void loader_init(void)
                load_class_bootstrap(utf_new_char("java/lang/VMThrowable"));
 #endif
 
-       /* Some classes which may be used often. */
+       /* Important system exceptions. */
 
-#if defined(ENABLE_JAVASE)
-       class_java_lang_StackTraceElement =
-               load_class_bootstrap(utf_java_lang_StackTraceElement);
+       class_java_lang_Exception  = load_class_bootstrap(utf_java_lang_Exception);
 
-       class_java_lang_reflect_Constructor =
-               load_class_bootstrap(utf_java_lang_reflect_Constructor);
+       class_java_lang_ClassNotFoundException =
+               load_class_bootstrap(utf_java_lang_ClassNotFoundException);
 
-       class_java_lang_reflect_Field =
-               load_class_bootstrap(utf_java_lang_reflect_Field);
+       class_java_lang_RuntimeException =
+               load_class_bootstrap(utf_java_lang_RuntimeException);
 
-       class_java_lang_reflect_Method =
-               load_class_bootstrap(utf_java_lang_reflect_Method);
+       /* Some classes which may be used often. */
 
-       class_java_security_PrivilegedAction =
-               load_class_bootstrap(utf_new_char("java/security/PrivilegedAction"));
+#if defined(ENABLE_JAVASE)
+       class_java_lang_StackTraceElement      = load_class_bootstrap(utf_java_lang_StackTraceElement);
 
-       class_java_util_HashMap = 
-               load_class_bootstrap(utf_new_char("java/util/HashMap"));
+       class_java_lang_reflect_Constructor    = load_class_bootstrap(utf_java_lang_reflect_Constructor);
+       class_java_lang_reflect_Field          = load_class_bootstrap(utf_java_lang_reflect_Field);
+       class_java_lang_reflect_Method         = load_class_bootstrap(utf_java_lang_reflect_Method);
 
-       class_java_util_Vector     = load_class_bootstrap(utf_java_util_Vector);
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+       class_java_lang_reflect_VMConstructor  = load_class_bootstrap(utf_java_lang_reflect_VMConstructor);
+       class_java_lang_reflect_VMField        = load_class_bootstrap(utf_java_lang_reflect_VMField);
+       class_java_lang_reflect_VMMethod       = load_class_bootstrap(utf_java_lang_reflect_VMMethod);
+# endif
 
-# if defined(WITH_CLASSPATH_SUN)
+       class_java_security_PrivilegedAction   = load_class_bootstrap(utf_new_char("java/security/PrivilegedAction"));
+
+       class_java_util_HashMap                = load_class_bootstrap(utf_new_char("java/util/HashMap"));
+       class_java_util_Vector                 = load_class_bootstrap(utf_java_util_Vector);
+
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
        class_sun_reflect_MagicAccessorImpl =
                load_class_bootstrap(utf_new_char("sun/reflect/MagicAccessorImpl"));
 # endif
@@ -233,7 +240,7 @@ void loader_init(void)
        class_sun_reflect_ConstantPool =
                load_class_bootstrap(utf_new_char("sun/reflect/ConstantPool"));
 
-#  if defined(WITH_CLASSPATH_GNU)
+#  if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
        /* needed by GNU Classpaths annotation support */
        class_sun_reflect_annotation_AnnotationParser =
                load_class_bootstrap(utf_new_char("sun/reflect/annotation/AnnotationParser"));
@@ -251,7 +258,7 @@ void loader_init(void)
 
 *******************************************************************************/
 
-classloader *loader_hashtable_classloader_add(java_handle_t *cl)
+classloader_t *loader_hashtable_classloader_add(java_handle_t *cl)
 {
        hashtable_classloader_entry *cle;
        u4   key;
@@ -334,7 +341,7 @@ classloader *loader_hashtable_classloader_add(java_handle_t *cl)
 
 *******************************************************************************/
 
-classloader *loader_hashtable_classloader_find(java_handle_t *cl)
+classloader_t *loader_hashtable_classloader_find(java_handle_t *cl)
 {
        hashtable_classloader_entry *cle;
        u4   key;
@@ -538,7 +545,7 @@ static bool load_constantpool(classbuffer *cb, descriptor_pool *descpool)
        u1 *cptags;
        voidptr *cpinfos;
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* number of entries in the constant_pool table plus one */
        if (!suck_check_classbuffer_size(cb, 2))
@@ -930,7 +937,7 @@ bool loader_load_attribute_signature(classbuffer *cb, utf **signature)
 
        /* get classinfo */
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* check remaining bytecode */
 
@@ -980,7 +987,7 @@ classinfo *load_class_from_sysloader(utf *name)
 {
        methodinfo    *m;
        java_handle_t *clo;
-       classloader   *cl;
+       classloader_t *cl;
        classinfo     *c;
 
        assert(class_java_lang_Object);
@@ -1023,7 +1030,7 @@ classinfo *load_class_from_sysloader(utf *name)
 
 *******************************************************************************/
 
-classinfo *load_class_from_classloader(utf *name, classloader *cl)
+classinfo *load_class_from_classloader(utf *name, classloader_t *cl)
 {
        java_handle_t *o;
        classinfo     *c;
@@ -1123,7 +1130,7 @@ classinfo *load_class_from_classloader(utf *name, classloader *cl)
 
                LLNI_class_get(cl, c);
 
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
                /* OpenJDK uses this internal function because it's
                   synchronized. */
 
@@ -1316,7 +1323,7 @@ classinfo *load_class_bootstrap(utf *name)
                else {
                        /* Add the package name to the boot packages. */
 
-                       package_add(c->packagename);
+                       Package_add(c->packagename);
                }
 
                r = res;
@@ -1395,7 +1402,7 @@ static bool load_class_from_classbuffer_intern(classbuffer *cb)
 
        /* Get the classbuffer's class. */
 
-       c = cb->class;
+       c = cb->clazz;
 
        if (!suck_check_classbuffer_size(cb, 4 + 2 + 2))
                return false;
@@ -1643,8 +1650,10 @@ static bool load_class_from_classbuffer_intern(classbuffer *cb)
                /* XXX This should be done better. */
                tc = resolve_classref_or_classinfo_eager(CLASSREF_OR_CLASSINFO(cr), false);
 
-               if (tc == NULL)
+               if (tc == NULL) {
+                       resolve_handle_pending_exception(true);
                        return false;
+               }
 
                /* Interfaces are not allowed as super classes. */
 
@@ -1678,8 +1687,10 @@ static bool load_class_from_classbuffer_intern(classbuffer *cb)
                /* XXX This should be done better. */
                tc = resolve_classref_or_classinfo_eager(CLASSREF_OR_CLASSINFO(cr), false);
 
-               if (tc == NULL)
+               if (tc == NULL) {
+                       resolve_handle_pending_exception(true);
                        return false;
+               }
 
                /* Detect circularity. */
 
@@ -1719,7 +1730,7 @@ static bool load_class_from_classbuffer_intern(classbuffer *cb)
                methodinfo *m = &c->methods[i];
                m->parseddesc =
                        descriptor_pool_parse_method_descriptor(descpool, m->descriptor,
-                                                                                                       m->flags, class_get_self_classref(m->class));
+                                                                                                       m->flags, class_get_self_classref(m->clazz));
                if (!m->parseddesc)
                        return false;
 
@@ -1941,7 +1952,7 @@ classinfo *load_class_from_classbuffer(classbuffer *cb)
 
        /* Get the classbuffer's class. */
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* Check if the class is already loaded. */
 
@@ -2022,7 +2033,7 @@ classinfo *load_class_from_classbuffer(classbuffer *cb)
 
 *******************************************************************************/
 
-classinfo *load_newly_created_array(classinfo *c, classloader *loader)
+classinfo *load_newly_created_array(classinfo *c, classloader_t *loader)
 {
        classinfo         *comp = NULL;
        methodinfo        *clone;
@@ -2164,7 +2175,7 @@ classinfo *load_newly_created_array(classinfo *c, classloader *loader)
        clone->name       = utf_clone;
        clone->descriptor = utf_void__java_lang_Object;
        clone->parseddesc = clonedesc;
-       clone->class      = c;
+       clone->clazz      = c;
 
        /* parse the descriptor to get the register allocation */