Renamed create_classinfo to class_create_classinfo.

diff --git a/src/vm/class.c b/src/vm/class.c
index 4810802a274f754f087253a01116ee2002f271c5..b5ff68924ac181d3fb7748a369d729df5f288a04 100644 (file)
--- a/src/vm/class.c
+++ b/src/vm/class.c
@@ -30,7 +30,7 @@
             Andreas Krall
             Christian Thalinger
 
-   $Id: class.c 2195 2005-04-03 16:53:16Z edwin $
+   $Id: class.c 2200 2005-04-03 21:44:19Z twisti $
 
 */
 
@@ -125,7 +125,14 @@ classinfo *pseudo_class_Arraystub = NULL;
 classinfo *pseudo_class_Null = NULL;
 classinfo *pseudo_class_New = NULL;
 
-classinfo *create_classinfo(utf *classname)
+
+/* class_create_classinfo ******************************************************
+
+   XXX
+
+*******************************************************************************/
+
+classinfo *class_create_classinfo(utf *classname)
 {
        classinfo *c;     /* hashtable element */
 
@@ -191,7 +198,7 @@ classinfo *create_classinfo(utf *classname)
                char *start = c->name->text;
                for (;p > start; --p) {
                        if (*p == '/') {
-                               c->packagename = utf_new (start, p - start);
+                               c->packagename = utf_new(start, p - start);
                                break;
                        }
                }
@@ -310,9 +317,11 @@ void class_free(classinfo *c)
 /*     GCFREE(c); */
 }
 
+
 /* get_array_class *************************************************************
 
-   Returns the array class with the given name for the given classloader.
+   Returns the array class with the given name for the given
+   classloader.
 
 *******************************************************************************/
 
@@ -330,7 +339,7 @@ static classinfo *get_array_class(utf *name,java_objectheader *initloader,
                return c;
 
        /* we have to create it */
-       c = create_classinfo(name);
+       c = class_create_classinfo(name);
        if (!load_newly_created_array(c,initloader))
                return NULL;
 
@@ -347,6 +356,7 @@ static classinfo *get_array_class(utf *name,java_objectheader *initloader,
        return c;
 }
 
+
 /* class_array_of **************************************************************
 
    Returns an array class with the given component class. The array
@@ -354,7 +364,7 @@ static classinfo *get_array_class(utf *name,java_objectheader *initloader,
 
 *******************************************************************************/
 
-classinfo *class_array_of(classinfo *component,bool link)
+classinfo *class_array_of(classinfo *component, bool link)
 {
     s4 namelen;
     char *namebuf;
@@ -380,7 +390,10 @@ classinfo *class_array_of(classinfo *component,bool link)
         namelen += 3;
     }
 
-       return get_array_class(utf_new(namebuf, namelen),component->classloader,component->classloader,link);
+       return get_array_class(utf_new(namebuf, namelen),
+                                                  component->classloader,
+                                                  component->classloader,
+                                                  link);
 }
 
 
@@ -391,7 +404,7 @@ classinfo *class_array_of(classinfo *component,bool link)
 
 *******************************************************************************/
 
-classinfo *class_multiarray_of(s4 dim, classinfo *element,bool link)
+classinfo *class_multiarray_of(s4 dim, classinfo *element, bool link)
 {
     s4 namelen;
     char *namebuf;
@@ -418,9 +431,13 @@ classinfo *class_multiarray_of(s4 dim, classinfo *element,bool link)
     }
        memset(namebuf, '[', dim);
 
-       return get_array_class(utf_new(namebuf, namelen),element->classloader,element->classloader,link);
+       return get_array_class(utf_new(namebuf, namelen),
+                                                  element->classloader,
+                                                  element->classloader,
+                                                  link);
 }
 
+
 /* class_lookup_classref *******************************************************
 
    Looks up the constant_classref for a given classname in the classref
@@ -436,7 +453,7 @@ classinfo *class_multiarray_of(s4 dim, classinfo *element,bool link)
    
 *******************************************************************************/
 
-constant_classref *class_lookup_classref(classinfo *cls,utf *name)
+constant_classref *class_lookup_classref(classinfo *cls, utf *name)
 {
        constant_classref *ref;
        extra_classref *xref;
@@ -454,7 +471,7 @@ constant_classref *class_lookup_classref(classinfo *cls,utf *name)
                        return ref;
 
        /* next try the list of extra classrefs */
-       for (xref=cls->extclassrefs; xref; xref=xref->next) {
+       for (xref = cls->extclassrefs; xref; xref = xref->next) {
                if (xref->classref.name == name)
                        return &(xref->classref);
        }
@@ -480,7 +497,7 @@ constant_classref *class_lookup_classref(classinfo *cls,utf *name)
    
 *******************************************************************************/
 
-constant_classref *class_get_classref(classinfo *cls,utf *name)
+constant_classref *class_get_classref(classinfo *cls, utf *name)
 {
        constant_classref *ref;
        extra_classref *xref;
@@ -501,6 +518,7 @@ constant_classref *class_get_classref(classinfo *cls,utf *name)
        return &(xref->classref);
 }
 
+
 /* class_get_classref_multiarray_of ********************************************
 
    Returns an array type reference with the given dimension and element class
@@ -519,7 +537,7 @@ constant_classref *class_get_classref(classinfo *cls,utf *name)
 
 *******************************************************************************/
 
-constant_classref *class_get_classref_multiarray_of(s4 dim,constant_classref *ref)
+constant_classref *class_get_classref_multiarray_of(s4 dim, constant_classref *ref)
 {
     s4 namelen;
     char *namebuf;
@@ -585,7 +603,7 @@ constant_classref *class_get_classref_component_of(constant_classref *ref)
                return NULL;
        }
 
-    return class_get_classref(ref->referer,utf_new(name, namelen));
+    return class_get_classref(ref->referer, utf_new(name, namelen));
 }
 
 

diff --git a/src/vm/class.h b/src/vm/class.h
index 03b24ed07a30e1e131b3a7b0c8798431c8db13a3..858a2d239ccbfe1ae28236e6eb266b6b42302b37 100644 (file)
--- a/src/vm/class.h
+++ b/src/vm/class.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: class.h 2195 2005-04-03 16:53:16Z edwin $
+   $Id: class.h 2200 2005-04-03 21:44:19Z twisti $
 
 */
 
@@ -219,7 +219,7 @@ extern classinfo *pseudo_class_New;
 /* function prototypes ********************************************************/
 
 /* create a new classinfo struct */
-classinfo *create_classinfo(utf *u);
+classinfo *class_create_classinfo(utf *u);
 
 /* frees all resources used by the class */
 void class_free(classinfo *);

diff --git a/src/vm/linker.c b/src/vm/linker.c
index 9ecd64c55cd659f1e59833a15d19f7b373af44dc..ce5896cce2590cfbb0168b425e72a90a5d2f7acb 100644 (file)
--- a/src/vm/linker.c
+++ b/src/vm/linker.c
@@ -32,7 +32,7 @@
             Edwin Steiner
             Christian Thalinger
 
-   $Id: linker.c 2195 2005-04-03 16:53:16Z edwin $
+   $Id: linker.c 2200 2005-04-03 21:44:19Z twisti $
 
 */
 
@@ -155,14 +155,15 @@ bool linker_init(void)
 
     /* pseudo class for Arraystubs (extends java.lang.Object) */
     
-    pseudo_class_Arraystub = create_classinfo(utf_new_char("$ARRAYSTUB$"));
+    pseudo_class_Arraystub =
+               class_create_classinfo(utf_new_char("$ARRAYSTUB$"));
        pseudo_class_Arraystub->loaded = true;
     pseudo_class_Arraystub->super.cls = class_java_lang_Object;
     pseudo_class_Arraystub->interfacescount = 2;
     pseudo_class_Arraystub->interfaces = MNEW(classref_or_classinfo, 2);
     pseudo_class_Arraystub->interfaces[0].cls = class_java_lang_Cloneable;
     pseudo_class_Arraystub->interfaces[1].cls = class_java_io_Serializable;
-       if (!classcache_store(NULL,pseudo_class_Arraystub))
+       if (!classcache_store(NULL, pseudo_class_Arraystub))
                panic("could not cache pseudo_class_Arraystub");
 
     if (!link_class(pseudo_class_Arraystub))
@@ -170,10 +171,10 @@ bool linker_init(void)
 
     /* pseudo class representing the null type */
     
-       pseudo_class_Null = create_classinfo(utf_new_char("$NULL$"));
+       pseudo_class_Null = class_create_classinfo(utf_new_char("$NULL$"));
        pseudo_class_Null->loaded = true;
     pseudo_class_Null->super.cls = class_java_lang_Object;
-       if (!classcache_store(NULL,pseudo_class_Null))
+       if (!classcache_store(NULL, pseudo_class_Null))
                panic("could not cache pseudo_class_Null");
 
        if (!link_class(pseudo_class_Null))
@@ -181,7 +182,7 @@ bool linker_init(void)
 
     /* pseudo class representing new uninitialized objects */
     
-       pseudo_class_New = create_classinfo(utf_new_char("$NEW$"));
+       pseudo_class_New = class_create_classinfo(utf_new_char("$NEW$"));
        pseudo_class_New->loaded = true;
        pseudo_class_New->linked = true; /* XXX is this allright? */
        pseudo_class_New->super.cls = class_java_lang_Object;
@@ -220,7 +221,7 @@ static bool link_primitivetype_table(void)
                        continue;
                
                /* create primitive class */
-               c = create_classinfo(utf_new_char(primitivetype_table[i].name));
+               c = class_create_classinfo(utf_new_char(primitivetype_table[i].name));
                c->classUsed = NOTUSED; /* not used initially CO-RT */
                c->impldBy = NULL;
                
@@ -244,8 +245,8 @@ static bool link_primitivetype_table(void)
 
                /* create the primitive array class */
                if (primitivetype_table[i].arrayname) {
-                       c = create_classinfo(utf_new_char(primitivetype_table[i].arrayname));
-                       if (!load_newly_created_array(c,NULL))
+                       c = class_create_classinfo(utf_new_char(primitivetype_table[i].arrayname));
+                       if (!load_newly_created_array(c, NULL))
                                return false;
                        primitivetype_table[i].arrayclass = c;
                        assert(c->loaded);