* configure.ac (AC_CHECK_ENABLE_ASSERTION): Added
[cacao.git] / src / vmcore / class.c
index d00a40953523f5fb670db565ebdaa1d64236e8ff..1e5d2f30480be57d3dc19c1921c682cbb1a1b209 100644 (file)
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: class.c 8321 2007-08-16 11:37:25Z michi $
-
 */
 
 
@@ -46,6 +44,7 @@
 
 #include "toolbox/logging.h"
 
+#include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
@@ -82,30 +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;
-
-#if defined(WITH_CLASSPATH_SUN)
-classinfo *class_sun_reflect_MagicAccessorImpl;
-#endif
-
-/* 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;
@@ -119,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)
@@ -134,15 +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;
 
-#if defined(ENABLE_ANNOTATIONS)
+# if defined(ENABLE_ANNOTATIONS)
 classinfo *class_sun_reflect_ConstantPool;
+#  if defined(WITH_CLASSPATH_GNU)
 classinfo *class_sun_reflect_annotation_AnnotationParser;
+#  endif
+# endif
 #endif
-#endif
-
 
 /* pseudo classes for the typechecker */
 
@@ -153,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;
 }
 
 
@@ -216,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
@@ -297,7 +292,7 @@ void class_postset_header_vftbl(void)
 
 *******************************************************************************/
 
-classinfo *class_define(utf *name, classloader *cl, int32_t length, const uint8_t *data)
+classinfo *class_define(utf *name, classloader *cl, int32_t length, const uint8_t *data, java_handle_t *pd)
 {
        classinfo   *c;
        classinfo   *r;
@@ -363,6 +358,14 @@ classinfo *class_define(utf *name, classloader *cl, int32_t length, const uint8_
                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
@@ -523,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;
 
@@ -577,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) {
@@ -614,21 +648,11 @@ bool class_load_attributes(classbuffer *cb)
 #endif
 
 #if defined(ENABLE_ANNOTATIONS)
-               /* XXX We can't do a release with that enabled */
-
                else if (attribute_name == utf_RuntimeVisibleAnnotations) {
                        /* RuntimeVisibleAnnotations */
                        if (!annotation_load_class_attribute_runtimevisibleannotations(cb))
                                return false;
                }
-               /* XXX RuntimeInvisibleAnnotations should only be loaded
-                * (or returned to Java) if some commandline options says so.
-                * Currently there is no such option available in cacao,
-                * therefore I load them allways (for testing purpose).
-                * Anyway, bytecode for RuntimeInvisibleAnnotations is only
-                * generated if you tell javac to do so. So in most cases
-                * there won't be any.
-                */
                else if (attribute_name == utf_RuntimeInvisibleAnnotations) {
                        /* RuntimeInvisibleAnnotations */
                        if (!annotation_load_class_attribute_runtimeinvisibleannotations(cb))
@@ -763,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) {
@@ -807,16 +829,6 @@ void class_free(classinfo *c)
                mem_free(c->header.vftbl, sizeof(vftbl) + sizeof(methodptr)*(c->vftbl->vftbllength-1)); */
        
 /*     GCFREE(c); */
-
-#if defined(ENABLE_ANNOTATIONS)
-       annotation_bytearray_free(c->annotations);
-
-       annotation_bytearrays_free(c->method_annotations);
-       annotation_bytearrays_free(c->method_parameterannotations);
-       annotation_bytearrays_free(c->method_annotationdefaults);
-
-       annotation_bytearrays_free(c->field_annotations);
-#endif
 }
 
 
@@ -1210,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;
@@ -1236,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;
@@ -1285,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;
@@ -1370,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;
 }
@@ -1444,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 */
 
@@ -1492,37 +1503,6 @@ fieldinfo *class_resolvefield(classinfo *c, utf *name, utf *desc,
 }
 
 
-/* class_resolve_superclass ****************************************************
-
-   Resolves the super class reference of the given class if necessary.
-
-*******************************************************************************/
-
-static classinfo *class_resolve_superclass(classinfo *c)
-{
-       classinfo *super;
-
-       if (c->super.any == NULL)
-               return NULL;
-
-       /* Do we have a super class reference or is it already
-          resolved? */
-
-       if (IS_CLASSREF(c->super)) {
-               super = resolve_classref_or_classinfo_eager(c->super, true);
-
-               if (super == NULL)
-                       return NULL;
-
-               /* Store the resolved super class in the class structure. */
-
-               c->super.cls = super;
-       }
-
-       return c->super.cls;
-}
-
-
 /* class_issubclass ************************************************************
 
    Checks if sub is a descendant of super.
@@ -1531,14 +1511,23 @@ static classinfo *class_resolve_superclass(classinfo *c)
 
 bool class_issubclass(classinfo *sub, classinfo *super)
 {
+       classinfo *c;
+
+       c = sub;
+
        for (;;) {
-               if (sub == NULL)
+               /* 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 = class_resolve_superclass(sub);
+               c = c->super;
        }
 }
 
@@ -1593,79 +1582,36 @@ bool class_isanysubclass(classinfo *sub, classinfo *super)
 }
 
 
-/* class_is_primitive **********************************************************
+/* class_get_componenttype *****************************************************
 
-   Checks if the given class is a primitive class.
+   Return the component class of the given class.  If the given class
+   is not an array, return NULL.
 
 *******************************************************************************/
 
-bool class_is_primitive(classinfo *c)
+classinfo *class_get_componenttype(classinfo *c)
 {
-       if (c->flags & ACC_CLASS_PRIMITIVE)
-               return true;
-
-       return false;
-}
-
-
-/* class_is_array **************************************************************
-
-   Checks if the given class is an array class.
-
-*******************************************************************************/
+       classinfo       *component;
+       arraydescriptor *ad;
+       
+       /* XXX maybe we could find a way to do this without linking. */
+       /* This way should be safe and easy, however.                */
 
-bool class_is_array(classinfo *c)
-{
        if (!(c->state & CLASS_LINKED))
                if (!link_class(c))
-                       return false;
-
-       return (c->vftbl->arraydesc != NULL);
-}
-
-
-/* class_is_interface **********************************************************
-
-   Checks if the given class is an interface.
-
-*******************************************************************************/
-
-bool class_is_interface(classinfo *c)
-{
-       if (c->flags & ACC_INTERFACE)
-               return true;
-
-       return false;
-}
-
-
-/* class_get_superclass ********************************************************
-
-   Return the super class of the given class.  If the super-field is a
-   class-reference, resolve it and store it in the classinfo.
-
-*******************************************************************************/
-
-classinfo *class_get_superclass(classinfo *c)
-{
-       classinfo *super;
-
-       /* For java.lang.Object, primitive and Void classes we return
-          NULL. */
-
-       if (c->super.any == NULL)
-               return NULL;
-
-       /* For interfaces we also return NULL. */
+                       return NULL;
 
-       if (c->flags & ACC_INTERFACE)
+       ad = c->vftbl->arraydesc;
+       
+       if (ad == NULL)
                return NULL;
-
-       /* We may have to resolve the super class reference. */
-
-       super = class_resolve_superclass(c);
-
-       return super;
+       
+       if (ad->arraytype == ARRAYTYPE_OBJECT)
+               component = ad->componentvftbl->class;
+       else
+               component = primitive_class_get_by_type(ad->arraytype);
+               
+       return component;
 }
 
 
@@ -1692,9 +1638,15 @@ java_handle_objectarray_t *class_get_declaredclasses(classinfo *c, bool publicOn
                /* 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;
 
-                       /* Check if outer_class is a classref or a real class and
+                       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;
@@ -1718,6 +1670,12 @@ java_handle_objectarray_t *class_get_declaredclasses(classinfo *c, bool publicOn
                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. */
 
@@ -1755,52 +1713,71 @@ java_handle_objectarray_t *class_get_declaredclasses(classinfo *c, bool publicOn
 
 classinfo *class_get_declaringclass(classinfo *c)
 {
-       classref_or_classinfo  innercr;
-       utf                   *innername;
-       classref_or_classinfo  outercr;
-       classinfo             *outer;
-       int16_t                i;
+       classref_or_classinfo  cr;
+       classinfo             *dc;
 
-       /* return NULL for arrayclasses and primitive classes */
+       /* Get declaring class. */
 
-       if (class_is_primitive(c) || (c->name->text[0] == '['))
+       cr = c->declaringclass;
+
+       if (cr.any == NULL)
                return NULL;
 
-       /* no innerclasses exist */
+       /* Resolve the class if necessary. */
 
-       if (c->innerclasscount == 0)
-               return NULL;
+       if (IS_CLASSREF(cr)) {
+/*             dc = resolve_classref_eager(cr.ref); */
+               dc = resolve_classref_or_classinfo_eager(cr, true);
 
-       for (i = 0; i < c->innerclasscount; i++) {
-               /* Check if inner_class is a classref or a real class and get
-                  the class name from the structure. */
+               if (dc == NULL)
+                       return NULL;
 
-               innercr = c->innerclass[i].inner_class;
+               /* Store the resolved class in the class structure. */
 
-               innername = IS_CLASSREF(innercr) ?
-                       innercr.ref->name : innercr.cls->name;
+               cr.cls = dc;
+       }
 
-               /* Is the current innerclass this class? */
+       dc = cr.cls;
 
-               if (innername == c->name) {
-                       /* Maybe the outer class is not loaded yet. */
+       return dc;
+}
 
-                       outercr = c->innerclass[i].outer_class;
 
-                       outer = resolve_classref_or_classinfo_eager(outercr, false);
+/* class_get_enclosingclass ****************************************************
 
-                       if (outer == NULL)
-                               return NULL;
+   Return the enclosing class for the given class.
 
-                       if (!(outer->state & CLASS_LINKED))
-                               if (!link_class(outer))
-                                       return NULL;
+*******************************************************************************/
 
-                       return outer;
-               }
+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;
        }
 
-       return NULL;
+       ec = cr.cls;
+
+       return ec;
 }
 
 
@@ -1826,7 +1803,7 @@ java_handle_objectarray_t *class_get_interfaces(classinfo *c)
                return NULL;
 
        for (i = 0; i < c->interfacescount; i++) {
-               ic = c->interfaces[i].cls;
+               ic = c->interfaces[i];
 
                LLNI_array_direct(oa, i) = (java_object_t *) ic;
        }
@@ -1835,6 +1812,85 @@ java_handle_objectarray_t *class_get_interfaces(classinfo *c)
 }
 
 
+/* 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
@@ -1986,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 ******************************************************
@@ -2099,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");
        }
 
@@ -2110,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");