* configure.ac (AC_CHECK_ENABLE_ASSERTION): Added
[cacao.git] / src / vmcore / class.c
index c2fc59726e5ad317b8b4730a3b4746ff98b9cae3..1e5d2f30480be57d3dc19c1921c682cbb1a1b209 100644 (file)
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: class.c 8056 2007-06-10 14:49:57Z michi $
-
 */
 
 
 
 #include "mm/memory.h"
 
+#include "native/llni.h"
+
 #include "threads/lock-common.h"
 
 #include "toolbox/logging.h"
 
+#include "vm/array.h"
+#include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
+#include "vm/resolve.h"
 
 #include "vm/jit/asmpart.h"
 
 #include "vmcore/class.h"
 #include "vmcore/classcache.h"
+#include "vmcore/linker.h"
 #include "vmcore/loader.h"
 #include "vmcore/options.h"
 
 
 /* global variables ***********************************************************/
 
-list_t unlinkedclasses;                 /* this is only used for eager class  */
-                                        /* loading                            */
-
-
 /* frequently used classes ****************************************************/
 
 /* important system classes */
@@ -81,27 +81,18 @@ classinfo *class_java_lang_String;
 classinfo *class_java_lang_System;
 classinfo *class_java_lang_Thread;
 classinfo *class_java_lang_ThreadGroup;
-classinfo *class_java_lang_VMSystem;
-classinfo *class_java_lang_VMThread;
-classinfo *class_java_io_Serializable;
-
-
-/* system exception classes required in cacao */
-
 classinfo *class_java_lang_Throwable;
-classinfo *class_java_lang_Error;
-classinfo *class_java_lang_LinkageError;
-classinfo *class_java_lang_NoClassDefFoundError;
-classinfo *class_java_lang_OutOfMemoryError;
-classinfo *class_java_lang_VirtualMachineError;
+classinfo *class_java_io_Serializable;
 
 #if defined(WITH_CLASSPATH_GNU)
+classinfo *class_java_lang_VMSystem;
+classinfo *class_java_lang_VMThread;
 classinfo *class_java_lang_VMThrowable;
 #endif
 
-classinfo *class_java_lang_Exception;
-classinfo *class_java_lang_ClassCastException;
-classinfo *class_java_lang_ClassNotFoundException;
+#if defined(WITH_CLASSPATH_SUN)
+classinfo *class_sun_reflect_MagicAccessorImpl;
+#endif
 
 #if defined(ENABLE_JAVASE)
 classinfo *class_java_lang_Void;
@@ -115,12 +106,6 @@ classinfo *class_java_lang_Long;
 classinfo *class_java_lang_Float;
 classinfo *class_java_lang_Double;
 
-
-/* some runtime exception */
-
-classinfo *class_java_lang_NullPointerException;
-
-
 /* some classes which may be used more often */
 
 #if defined(ENABLE_JAVASE)
@@ -130,10 +115,17 @@ classinfo *class_java_lang_reflect_Field;
 classinfo *class_java_lang_reflect_Method;
 classinfo *class_java_security_PrivilegedAction;
 classinfo *class_java_util_Vector;
+classinfo *class_java_util_HashMap;
 
 classinfo *arrayclass_java_lang_Object;
-#endif
 
+# if defined(ENABLE_ANNOTATIONS)
+classinfo *class_sun_reflect_ConstantPool;
+#  if defined(WITH_CLASSPATH_GNU)
+classinfo *class_sun_reflect_annotation_AnnotationParser;
+#  endif
+# endif
+#endif
 
 /* pseudo classes for the typechecker */
 
@@ -144,36 +136,47 @@ classinfo *pseudo_class_New;
 
 /* class_set_packagename *******************************************************
 
-   Derive the package name from the class name and store it in the struct.
+   Derive the package name from the class name and store it in the
+   struct.
+
+   An internal package name consists of the package name plus the
+   trailing '/', e.g. "java/lang/".
+
+   For classes in the unnamed package, the package name is set to
+   NULL.
 
 *******************************************************************************/
 
 void class_set_packagename(classinfo *c)
 {
-       char *p = UTF_END(c->name) - 1;
-       char *start = c->name->text;
+       char *p;
+       char *start;
 
-       /* set the package name */
-       /* classes in the unnamed package keep packagename == NULL */
+       p     = UTF_END(c->name) - 1;
+       start = c->name->text;
 
        if (c->name->text[0] == '[') {
-               /* set packagename of arrays to the element's package */
+               /* Set packagename of arrays to the element's package. */
 
                for (; *start == '['; start++);
 
-               /* skip the 'L' in arrays of references */
+               /* Skip the 'L' in arrays of references. */
+
                if (*start == 'L')
                        start++;
+       }
 
-               for (; (p > start) && (*p != '/'); --p);
+       /* Search for last '/'. */
 
-               c->packagename = utf_new(start, p - start);
+       for (; (p > start) && (*p != '/'); --p);
 
-       } else {
-               for (; (p > start) && (*p != '/'); --p);
+       /* If we found a '/' we set the package name plus the trailing
+          '/'.  Otherwise we set the packagename to NULL. */
 
-               c->packagename = utf_new(start, p - start);
-       }
+       if (p > start)
+               c->packagename = utf_new(start, p - start + 1);
+       else
+               c->packagename = NULL;
 }
 
 
@@ -207,14 +210,15 @@ classinfo *class_create_classinfo(utf *classname)
                log_message_utf("Creating class: ", classname);
 #endif
 
-       /* GCNEW_UNCOLLECTABLE clears the allocated memory */
-
-#if defined(ENABLE_GC_CACAO)
+#if !defined(ENABLE_GC_BOEHM)
        c = (classinfo *) heap_alloc_uncollectable(sizeof(classinfo));
+       /*c = NEW(classinfo);
+       MZERO(c, classinfo, 1);*/
 #else
        c = GCNEW_UNCOLLECTABLE(classinfo, 1);
-       /*c=NEW(classinfo);*/
+       /* GCNEW_UNCOLLECTABLE clears the allocated memory */
 #endif
+
        c->name = classname;
 
        /* Set the header.vftbl of all loaded classes to the one of
@@ -228,13 +232,13 @@ classinfo *class_create_classinfo(utf *classname)
        /* check if the class is a reference class and flag it */
 
        if (classname == utf_java_lang_ref_SoftReference) {
-               c->flags |= ACC_CLASS_SOFT_REFERENCE;
+               c->flags |= ACC_CLASS_REFERENCE_SOFT;
        }
        else if (classname == utf_java_lang_ref_WeakReference) {
-               c->flags |= ACC_CLASS_WEAK_REFERENCE;
+               c->flags |= ACC_CLASS_REFERENCE_WEAK;
        }
        else if (classname == utf_java_lang_ref_PhantomReference) {
-               c->flags |= ACC_CLASS_PHANTOM_REFERENCE;
+               c->flags |= ACC_CLASS_REFERENCE_PHANTOM;
        }
 #endif
 
@@ -288,7 +292,7 @@ void class_postset_header_vftbl(void)
 
 *******************************************************************************/
 
-classinfo *class_define(utf *name, java_objectheader *cl, s4 length, u1 *data)
+classinfo *class_define(utf *name, classloader *cl, int32_t length, const uint8_t *data, java_handle_t *pd)
 {
        classinfo   *c;
        classinfo   *r;
@@ -354,6 +358,14 @@ classinfo *class_define(utf *name, java_objectheader *cl, s4 length, u1 *data)
                return NULL;
        }
 
+#if defined(ENABLE_JAVASE)
+# if defined(WITH_CLASSPATH_SUN)
+       /* Store the protection domain. */
+
+       c->protectiondomain = pd;
+# endif
+#endif
+
        /* Store the newly defined class in the class cache. This call
           also checks whether a class of the same name has already been
           defined by the same defining loader, and if so, replaces the
@@ -514,11 +526,16 @@ static bool class_load_attribute_enclosingmethod(classbuffer *cb)
 
 bool class_load_attributes(classbuffer *cb)
 {
-       classinfo *c;
-       u4         i, j;
-       u2         attributes_count;
-       u2         attribute_name_index;
-       utf       *attribute_name;
+       classinfo             *c;
+       uint16_t               attributes_count;
+       uint16_t               attribute_name_index;
+       utf                   *attribute_name;
+       innerclassinfo        *info;
+       classref_or_classinfo  inner;
+       classref_or_classinfo  outer;
+       utf                   *name;
+       uint16_t               flags;
+       int                    i, j;
 
        c = cb->class;
 
@@ -568,19 +585,45 @@ bool class_load_attributes(classbuffer *cb)
                        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. */
+                                  the access flags. */
                                                                
-                               innerclassinfo *info = c->innerclass + j;
-
-                               info->inner_class.ref =
-                                       innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
-                               info->outer_class.ref =
-                                       innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
-                               info->name =
-                                       innerclass_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
-                               info->flags = suck_u2(cb);
+                               info = c->innerclass + j;
+
+                               inner.ref = innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
+                               outer.ref = innerclass_getconstant(c, suck_u2(cb), CONSTANT_Class);
+                               name      = innerclass_getconstant(c, suck_u2(cb), CONSTANT_Utf8);
+                               flags     = suck_u2(cb);
+
+                               /* If the current inner-class is the currently loaded
+                                  class check for some special flags. */
+
+                               if (inner.ref->name == c->name) {
+                                       /* If an inner-class is not a member, its
+                                          outer-class is NULL. */
+
+                                       if (outer.ref != NULL) {
+                                               c->flags |= ACC_CLASS_MEMBER;
+
+                                               /* A member class doesn't have an
+                                                  EnclosingMethod attribute, so set the
+                                                  enclosing-class to be the same as the
+                                                  declaring-class. */
+
+                                               c->declaringclass = outer;
+                                               c->enclosingclass = outer;
+                                       }
+
+                                       /* If an inner-class is anonymous, its name is
+                                          NULL. */
+
+                                       if (name == NULL)
+                                               c->flags |= ACC_CLASS_ANONYMOUS;
+                               }
+
+                               info->inner_class = inner;
+                               info->outer_class = outer;
+                               info->name        = name;
+                               info->flags       = flags;
                        }
                }
                else if (attribute_name == utf_SourceFile) {
@@ -602,17 +645,21 @@ bool class_load_attributes(classbuffer *cb)
                        if (!loader_load_attribute_signature(cb, &(c->signature)))
                                return false;
                }
-#if 0
-               /* XXX We can't do a release with that enabled */
+#endif
 
+#if defined(ENABLE_ANNOTATIONS)
                else if (attribute_name == utf_RuntimeVisibleAnnotations) {
                        /* RuntimeVisibleAnnotations */
-
-                       if (!annotation_load_attribute_runtimevisibleannotations(cb))
+                       if (!annotation_load_class_attribute_runtimevisibleannotations(cb))
+                               return false;
+               }
+               else if (attribute_name == utf_RuntimeInvisibleAnnotations) {
+                       /* RuntimeInvisibleAnnotations */
+                       if (!annotation_load_class_attribute_runtimeinvisibleannotations(cb))
                                return false;
                }
 #endif
-#endif
+
                else {
                        /* unknown attribute */
 
@@ -740,18 +787,16 @@ void class_free(classinfo *c)
 {
        s4 i;
        vftbl_t *v;
-               
+
        class_freecpool(c);
 
-       if (c->interfaces)
+       if (c->interfaces != NULL)
                MFREE(c->interfaces, classinfo*, c->interfacescount);
 
        if (c->fields) {
                for (i = 0; i < c->fieldscount; i++)
                        field_free(&(c->fields[i]));
-#if defined(ENABLE_CACAO_GC)
                MFREE(c->fields, fieldinfo, c->fieldscount);
-#endif
        }
        
        if (c->methods) {
@@ -837,10 +882,14 @@ static classinfo *get_array_class(utf *name,classloader *initloader,
 
 classinfo *class_array_of(classinfo *component, bool link)
 {
-    s4 namelen;
-    char *namebuf;
-       s4 dumpsize;
-       classinfo *c;
+       classloader       *cl;
+    s4                 namelen;
+    char              *namebuf;
+       utf               *u;
+       classinfo         *c;
+       s4                 dumpsize;
+
+       cl = component->classloader;
 
        dumpsize = dump_size();
 
@@ -853,8 +902,8 @@ classinfo *class_array_of(classinfo *component, bool link)
         namebuf[0] = '[';
         MCOPY(namebuf + 1, component->name->text, char, namelen);
         namelen++;
-
-    } else {
+    }
+       else {
         /* the component is a non-array class */
         namebuf = DMNEW(char, namelen + 3);
         namebuf[0] = '[';
@@ -864,10 +913,9 @@ classinfo *class_array_of(classinfo *component, bool link)
         namelen += 3;
     }
 
-       c = get_array_class(utf_new(namebuf, namelen),
-                                               component->classloader,
-                                               component->classloader,
-                                               link);
+       u = utf_new(namebuf, namelen);
+
+       c = get_array_class(u, cl, cl, link);
 
        dump_release(dumpsize);
 
@@ -1174,7 +1222,7 @@ methodinfo *class_resolvemethod(classinfo *c, utf *name, utf *desc)
                if (name == utf_init || name == utf_clinit)
                        return NULL;
 
-               c = c->super.cls;
+               c = c->super;
        }
 
        return NULL;
@@ -1200,11 +1248,10 @@ static methodinfo *class_resolveinterfacemethod_intern(classinfo *c,
        if (m != NULL)
                return m;
 
-       /* no method found? try the superinterfaces */
+       /* No method found?  Try the super interfaces. */
 
        for (i = 0; i < c->interfacescount; i++) {
-               m = class_resolveinterfacemethod_intern(c->interfaces[i].cls,
-                                                                                                       name, desc);
+               m = class_resolveinterfacemethod_intern(c->interfaces[i], name, desc);
 
                if (m != NULL)
                        return m;
@@ -1249,11 +1296,10 @@ methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *desc,
        if (m != NULL)
                goto found;
 
-       /* try the superinterfaces */
+       /* Try the super interfaces. */
 
        for (i = 0; i < c->interfacescount; i++) {
-               m = class_resolveinterfacemethod_intern(c->interfaces[i].cls,
-                                                                                               name, desc);
+               m = class_resolveinterfacemethod_intern(c->interfaces[i], name, desc);
 
                if (m != NULL)
                        goto found;
@@ -1334,8 +1380,8 @@ fieldinfo *class_findfield(classinfo *c, utf *name, utf *desc)
                if ((c->fields[i].name == name) && (c->fields[i].descriptor == desc))
                        return &(c->fields[i]);
 
-       if (c->super.cls)
-               return class_findfield(c->super.cls, name, desc);
+       if (c->super != NULL)
+               return class_findfield(c->super, name, desc);
 
        return NULL;
 }
@@ -1408,18 +1454,19 @@ static fieldinfo *class_resolvefield_int(classinfo *c, utf *name, utf *desc)
                }
     }
 
-       /* try superinterfaces recursively */
+       /* Try super interfaces recursively. */
 
        for (i = 0; i < c->interfacescount; i++) {
-               fi = class_resolvefield_int(c->interfaces[i].cls, name, desc);
-               if (fi)
+               fi = class_resolvefield_int(c->interfaces[i], name, desc);
+
+               if (fi != NULL)
                        return fi;
        }
 
-       /* try superclass */
+       /* Try super class. */
 
-       if (c->super.cls)
-               return class_resolvefield_int(c->super.cls, name, desc);
+       if (c->super != NULL)
+               return class_resolvefield_int(c->super, name, desc);
 
        /* not found */
 
@@ -1456,50 +1503,6 @@ fieldinfo *class_resolvefield(classinfo *c, utf *name, utf *desc,
 }
 
 
-/* class_is_primitive **********************************************************
-
-   Check if the given class is a primitive class.
-
-*******************************************************************************/
-
-bool class_is_primitive(classinfo *c)
-{
-       s4 i;
-
-       /* search table of primitive classes */
-
-       for (i = 0; i < PRIMITIVETYPE_COUNT; i++)
-               if (primitivetype_table[i].class_primitive == c)
-                       return true;
-
-       return false;
-}
-
-
-/* class_primitive_get *********************************************************
-
-   Returns the primitive class of the given class name.
-
-*******************************************************************************/
-
-classinfo *class_primitive_get(utf *name)
-{
-       s4 i;
-
-       /* search table of primitive classes */
-
-       for (i = 0; i < PRIMITIVETYPE_COUNT; i++)
-               if (primitivetype_table[i].name == name)
-                       return primitivetype_table[i].class_primitive;
-
-       vm_abort("class_primitive_get: unknown primitive type");
-
-       /* keep compiler happy */
-
-       return NULL;
-}
-
-
 /* class_issubclass ************************************************************
 
    Checks if sub is a descendant of super.
@@ -1508,14 +1511,23 @@ classinfo *class_primitive_get(utf *name)
 
 bool class_issubclass(classinfo *sub, classinfo *super)
 {
+       classinfo *c;
+
+       c = sub;
+
        for (;;) {
-               if (!sub)
+               /* We reached java/lang/Object and did not find the requested
+                  super class. */
+
+               if (c == NULL)
                        return false;
 
-               if (sub == super)
+               /* We found the requested super class. */
+
+               if (c == super)
                        return true;
 
-               sub = sub->super.cls;
+               c = c->super;
        }
 }
 
@@ -1532,8 +1544,7 @@ bool class_issubclass(classinfo *sub, classinfo *super)
 
 bool class_isanysubclass(classinfo *sub, classinfo *super)
 {
-       castinfo classvalues;
-       u4       diffval;
+       uint32_t diffval;
        bool     result;
 
        /* This is the trivial case. */
@@ -1543,8 +1554,7 @@ bool class_isanysubclass(classinfo *sub, classinfo *super)
 
        /* Primitive classes are only subclasses of themselves. */
 
-       if ((sub->flags & ACC_CLASS_PRIMITIVE) ||
-               (super->flags & ACC_CLASS_PRIMITIVE))
+       if (class_is_primitive(sub) || class_is_primitive(super))
                return false;
 
        /* Check for interfaces. */
@@ -1560,16 +1570,347 @@ bool class_isanysubclass(classinfo *sub, classinfo *super)
                if (sub->flags & ACC_INTERFACE)
                        return (super == class_java_lang_Object);
 
-               ASM_GETCLASSVALUES_ATOMIC(super->vftbl, sub->vftbl, &classvalues);
+               LOCK_MONITOR_ENTER(linker_classrenumber_lock);
+
+               diffval = sub->vftbl->baseval - super->vftbl->baseval;
+               result  = diffval <= (uint32_t) super->vftbl->diffval;
 
-               diffval = classvalues.sub_baseval - classvalues.super_baseval;
-               result  = diffval <= (u4) classvalues.super_diffval;
+               LOCK_MONITOR_EXIT(linker_classrenumber_lock);
        }
 
        return result;
 }
 
 
+/* class_get_componenttype *****************************************************
+
+   Return the component class of the given class.  If the given class
+   is not an array, return NULL.
+
+*******************************************************************************/
+
+classinfo *class_get_componenttype(classinfo *c)
+{
+       classinfo       *component;
+       arraydescriptor *ad;
+       
+       /* XXX maybe we could find a way to do this without linking. */
+       /* This way should be safe and easy, however.                */
+
+       if (!(c->state & CLASS_LINKED))
+               if (!link_class(c))
+                       return NULL;
+
+       ad = c->vftbl->arraydesc;
+       
+       if (ad == NULL)
+               return NULL;
+       
+       if (ad->arraytype == ARRAYTYPE_OBJECT)
+               component = ad->componentvftbl->class;
+       else
+               component = primitive_class_get_by_type(ad->arraytype);
+               
+       return component;
+}
+
+
+/* class_get_declaredclasses ***************************************************
+
+   Return an array of declared classes of the given class.
+
+*******************************************************************************/
+
+java_handle_objectarray_t *class_get_declaredclasses(classinfo *c, bool publicOnly)
+{
+       classref_or_classinfo  inner;
+       classref_or_classinfo  outer;
+       utf                   *outername;
+       int                    declaredclasscount;  /* number of declared classes */
+       int                    pos;                     /* current declared class */
+       java_handle_objectarray_t *oa;               /* array of declared classes */
+       int                    i;
+       classinfo             *ic;
+
+       declaredclasscount = 0;
+
+       if (!class_is_primitive(c) && !class_is_array(c)) {
+               /* Determine number of declared classes. */
+
+               for (i = 0; i < c->innerclasscount; i++) {
+                       /* Get outer-class.  If the inner-class is not a member
+                          class, the outer-class is NULL. */
+
+                       outer = c->innerclass[i].outer_class;
+
+                       if (outer.any == NULL)
+                               continue;
+
+                       /* Check if outer-class is a classref or a real class and
+               get the class name from the structure. */
+
+                       outername = IS_CLASSREF(outer) ? outer.ref->name : outer.cls->name;
+
+                       /* Outer class is this class. */
+
+                       if ((outername == c->name) &&
+                               ((publicOnly == 0) || (c->innerclass[i].flags & ACC_PUBLIC)))
+                               declaredclasscount++;
+               }
+       }
+
+       /* Allocate Class[] and check for OOM. */
+
+       oa = builtin_anewarray(declaredclasscount, class_java_lang_Class);
+
+       if (oa == NULL)
+               return NULL;
+
+       for (i = 0, pos = 0; i < c->innerclasscount; i++) {
+               inner = c->innerclass[i].inner_class;
+               outer = c->innerclass[i].outer_class;
+
+               /* Get outer-class.  If the inner-class is not a member class,
+                  the outer-class is NULL. */
+
+               if (outer.any == NULL)
+                       continue;
+
+               /* Check if outer_class is a classref or a real class and get
+                  the class name from the structure. */
+
+               outername = IS_CLASSREF(outer) ? outer.ref->name : outer.cls->name;
+
+               /* Outer class is this class. */
+
+               if ((outername == c->name) &&
+                       ((publicOnly == 0) || (c->innerclass[i].flags & ACC_PUBLIC))) {
+
+                       ic = resolve_classref_or_classinfo_eager(inner, false);
+
+                       if (ic == NULL)
+                               return NULL;
+
+                       if (!(ic->state & CLASS_LINKED))
+                               if (!link_class(ic))
+                                       return NULL;
+
+                       LLNI_array_direct(oa, pos++) = (java_object_t *) ic;
+               }
+       }
+
+       return oa;
+}
+
+
+/* class_get_declaringclass ****************************************************
+
+   If the class or interface given is a member of another class,
+   return the declaring class.  For array and primitive classes return
+   NULL.
+
+*******************************************************************************/
+
+classinfo *class_get_declaringclass(classinfo *c)
+{
+       classref_or_classinfo  cr;
+       classinfo             *dc;
+
+       /* Get declaring class. */
+
+       cr = c->declaringclass;
+
+       if (cr.any == NULL)
+               return NULL;
+
+       /* Resolve the class if necessary. */
+
+       if (IS_CLASSREF(cr)) {
+/*             dc = resolve_classref_eager(cr.ref); */
+               dc = resolve_classref_or_classinfo_eager(cr, true);
+
+               if (dc == NULL)
+                       return NULL;
+
+               /* Store the resolved class in the class structure. */
+
+               cr.cls = dc;
+       }
+
+       dc = cr.cls;
+
+       return dc;
+}
+
+
+/* class_get_enclosingclass ****************************************************
+
+   Return the enclosing class for the given class.
+
+*******************************************************************************/
+
+classinfo *class_get_enclosingclass(classinfo *c)
+{
+       classref_or_classinfo  cr;
+       classinfo             *ec;
+
+       /* Get enclosing class. */
+
+       cr = c->enclosingclass;
+
+       if (cr.any == NULL)
+               return NULL;
+
+       /* Resolve the class if necessary. */
+
+       if (IS_CLASSREF(cr)) {
+/*             ec = resolve_classref_eager(cr.ref); */
+               ec = resolve_classref_or_classinfo_eager(cr, true);
+
+               if (ec == NULL)
+                       return NULL;
+
+               /* Store the resolved class in the class structure. */
+
+               cr.cls = ec;
+       }
+
+       ec = cr.cls;
+
+       return ec;
+}
+
+
+/* class_get_interfaces ********************************************************
+
+   Return an array of interfaces of the given class.
+
+*******************************************************************************/
+
+java_handle_objectarray_t *class_get_interfaces(classinfo *c)
+{
+       classinfo                 *ic;
+       java_handle_objectarray_t *oa;
+       u4                         i;
+
+       if (!(c->state & CLASS_LINKED))
+               if (!link_class(c))
+                       return NULL;
+
+       oa = builtin_anewarray(c->interfacescount, class_java_lang_Class);
+
+       if (oa == NULL)
+               return NULL;
+
+       for (i = 0; i < c->interfacescount; i++) {
+               ic = c->interfaces[i];
+
+               LLNI_array_direct(oa, i) = (java_object_t *) ic;
+       }
+
+       return oa;
+}
+
+
+/* class_get_annotations *******************************************************
+
+   Get the unparsed declared annotations in a byte array
+   of the given class.
+
+   IN:
+       c........the class of which the annotations should be returned
+
+   RETURN VALUE:
+       The unparsed declared annotations in a byte array
+       (or NULL if there aren't any).
+
+*******************************************************************************/
+
+java_handle_bytearray_t *class_get_annotations(classinfo *c)
+{
+#if defined(ENABLE_ANNOTATIONS)
+       java_handle_t *annotations; /* unparsed annotations */
+
+       LLNI_classinfo_field_get(c, annotations, annotations);
+
+       return (java_handle_bytearray_t*)annotations;
+#else
+       return NULL;
+#endif
+}
+
+
+/* class_get_modifiers *********************************************************
+
+   Get the modifier flags of the given class.
+
+   IN:
+       c....the class of which the modifier flags should be returned
+          ignoreInnerClassesAttrib
+   RETURN VALUE:
+       modifier flags
+
+*******************************************************************************/
+
+int32_t class_get_modifiers(classinfo *c, bool ignoreInnerClassesAttrib)
+{
+       classref_or_classinfo  inner;
+       classref_or_classinfo  outer;
+       utf                   *innername;
+       int                    i;
+
+       if (!ignoreInnerClassesAttrib && (c->innerclasscount != 0)) {
+               /* search for passed class as inner class */
+
+               for (i = 0; i < c->innerclasscount; i++) {
+                       inner = c->innerclass[i].inner_class;
+                       outer = c->innerclass[i].outer_class;
+
+                       /* Check if inner is a classref or a real class and get
+               the name of the structure */
+
+                       innername = IS_CLASSREF(inner) ? inner.ref->name : inner.cls->name;
+
+                       /* innerclass is this class */
+
+                       if (innername == c->name) {
+                               /* has the class actually an outer class? */
+
+                               if (outer.any)
+                                       /* return flags got from the outer class file */
+                                       return c->innerclass[i].flags & ACC_CLASS_REFLECT_MASK;
+                               else
+                                       return c->flags & ACC_CLASS_REFLECT_MASK;
+                       }
+               }
+       }
+
+       /* passed class is no inner class or it was not requested */
+
+       return c->flags & ACC_CLASS_REFLECT_MASK;
+}
+
+
+/* class_get_signature *********************************************************
+
+   Return the signature of the given class.  For array and primitive
+   classes return NULL.
+
+*******************************************************************************/
+
+#if defined(ENABLE_JAVASE)
+utf *class_get_signature(classinfo *c)
+{
+       /* For array and primitive classes return NULL. */
+
+       if (class_is_array(c) || class_is_primitive(c))
+               return NULL;
+
+       return c->signature;
+}
+#endif
+
+
 /* class_printflags ************************************************************
 
    Prints flags of a class.
@@ -1701,11 +2042,13 @@ void class_classref_or_classinfo_print(classref_or_classinfo c)
 
 *******************************************************************************/
 
+#if !defined(NDEBUG)
 void class_classref_or_classinfo_println(classref_or_classinfo c)
 {
-       class_classref_or_classinfo_println(c);
+       class_classref_or_classinfo_print(c);
        printf("\n");
 }
+#endif
 
 
 /* class_showconstantpool ******************************************************
@@ -1814,9 +2157,9 @@ void class_showmethods (classinfo *c)
        utf_display_printable_ascii(c->name);
        printf("\n");
 
-       if (c->super.cls) {
+       if (c->super) {
                printf("Super: ");
-               utf_display_printable_ascii(c->super.cls->name);
+               utf_display_printable_ascii(c->super->name);
                printf ("\n");
        }
 
@@ -1825,8 +2168,8 @@ void class_showmethods (classinfo *c)
        printf("Interfaces:\n");        
        for (i = 0; i < c->interfacescount; i++) {
                printf("   ");
-               utf_display_printable_ascii(c->interfaces[i].cls->name);
-               printf (" (%d)\n", c->interfaces[i].cls->index);
+               utf_display_printable_ascii(c->interfaces[i]->name);
+               printf (" (%d)\n", c->interfaces[i]->index);
        }
 
        printf("Fields:\n");