* src/vm/class.h (classinfo): Typedef added.

* src/vm/descriptor.h (typedesc): Likewise.
(methoddesc): Likewise.
* src/vm/field.h (fieldinfo): Likewise.
* src/vm/method.h (methodinfo): Likewise.

* src/vm/references.h (config.h, vm/types.h, vm/class.h)
(vm/descriptor.h, vm/field.h, vm/method.h): Likewise.
(classinfo, methodinfo, fieldinfo, typedesc, methoddesc): Removed.
(constant_classref, classref_or_classinfo, parseddesc): Moved.

diff --git a/src/vm/class.h b/src/vm/class.h
index 5a1af884eba50c99e7e55b5e66fa64c6b002d702..157e16b109cf695134f2fa6cd176bcc14608fc05 100644 (file)
--- a/src/vm/class.h
+++ b/src/vm/class.h
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: class.h 5919 2006-11-05 21:18:05Z twisti $
+   $Id: class.h 6012 2006-11-16 19:45:15Z twisti $
 
 */
 
@@ -36,6 +36,7 @@
 
 /* forward typedefs ***********************************************************/
 
+typedef struct classinfo      classinfo; 
 typedef struct innerclassinfo innerclassinfo;
 typedef struct extra_classref extra_classref;
 

diff --git a/src/vm/descriptor.h b/src/vm/descriptor.h
index db711e10eea583f6f7592fc27bdf0f69fa4b4cbe..9183fffd981c09d07dff9e46410127479ca2eb58 100644 (file)
--- a/src/vm/descriptor.h
+++ b/src/vm/descriptor.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: descriptor.h 5828 2006-10-26 10:09:11Z twisti $
+   $Id: descriptor.h 6012 2006-11-16 19:45:15Z twisti $
 
 */
 
@@ -39,7 +39,10 @@
 /* forward typedefs ***********************************************************/
 
 typedef struct descriptor_pool descriptor_pool;
-typedef struct paramdesc paramdesc;
+typedef struct typedesc        typedesc;
+typedef struct paramdesc       paramdesc;
+typedef struct methoddesc      methoddesc;
+
 
 #include "vm/class.h"
 #include "vm/global.h"

diff --git a/src/vm/field.h b/src/vm/field.h
index 37df985a133c27c0504a6b97e06f7bdd22dd1efc..9847658d2fc05bcc36880d79f4c5e5b571c0714c 100644 (file)
--- a/src/vm/field.h
+++ b/src/vm/field.h
@@ -27,13 +27,18 @@
    Authors: Reinhard Grafl
             Christian Thalinger
 
-   $Id: field.h 5937 2006-11-08 22:00:57Z twisti $
+   $Id: field.h 6012 2006-11-16 19:45:15Z twisti $
 */
 
 
 #ifndef _FIELD_H
 #define _FIELD_H
 
+/* forward typedefs ***********************************************************/
+
+typedef struct fieldinfo fieldinfo; 
+
+
 #include "config.h"
 #include "vm/types.h"
 

diff --git a/src/vm/method.h b/src/vm/method.h
index a907c821b0f274dc57e9cf67d5f3c11d432c2bd0..ec57352af4ee9dbf5442075f55c255007a598b1e 100644 (file)
--- a/src/vm/method.h
+++ b/src/vm/method.h
@@ -28,7 +28,7 @@
             Christian Thalinger
             Edwin Steiner
 
-   $Id: method.h 5974 2006-11-12 15:14:19Z edwin $
+   $Id: method.h 6012 2006-11-16 19:45:15Z twisti $
 */
 
 
@@ -37,10 +37,11 @@
 
 /* forward typedefs ***********************************************************/
 
+typedef struct methodinfo          methodinfo; 
 typedef struct raw_exception_entry raw_exception_entry;
-typedef struct lineinfo lineinfo; 
-typedef struct method_assumption method_assumption;
-typedef struct method_worklist method_worklist;
+typedef struct lineinfo            lineinfo; 
+typedef struct method_assumption   method_assumption;
+typedef struct method_worklist     method_worklist;
 
 #include "config.h"
 #include "vm/types.h"

diff --git a/src/vm/references.h b/src/vm/references.h
index 8a50afc3cfcb297159cc91b3ef28bad30c867154..25569b8942f58b2ba934938f47c852898ddc1cf9 100644 (file)
--- a/src/vm/references.h
+++ b/src/vm/references.h
@@ -1,4 +1,4 @@
-/* vm/references.h - references to classes/fields/methods
+/* src/vm/references.h - references to classes/fields/methods
 
    Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
    C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
@@ -25,17 +25,56 @@
    Contact: cacao@cacaojvm.org
 
    Authors: Edwin Steiner
+            Christian Thalinger
 
-   Changes:
-
-   $Id: references.h 4758 2006-04-12 17:51:10Z edwin $
+   $Id: references.h 6012 2006-11-16 19:45:15Z twisti $
 
 */
 
 #ifndef _REFERENCES_H_
 #define _REFERENCES_H_
 
+/* forward typedefs ***********************************************************/
+
+typedef struct constant_classref constant_classref;
+typedef struct constant_FMIref   constant_FMIref;
+
+
+/* constant_classref **********************************************************/
+
+struct constant_classref {
+       void             *pseudo_vftbl; /* for distinguishing it from classinfo   */
+       struct classinfo *referer;    /* class containing the reference           */
+       struct utf       *name;       /* name of the class refered to             */
+};
+
+
+/* classref_or_classinfo ******************************************************/
+
+typedef union classref_or_classinfo {
+       constant_classref *ref;       /* a symbolic class reference               */
+       struct classinfo  *cls;       /* an already loaded class                  */
+       void              *any;       /* used for general access (x != NULL,...)  */
+} classref_or_classinfo;
+
+
+/* parseddesc *****************************************************************/
+
+typedef union parseddesc {
+       struct typedesc   *fd;        /* parsed field descriptor                  */
+       struct methoddesc *md;        /* parsed method descriptor                 */
+       void              *any;       /* used for simple test against NULL        */
+} parseddesc;
+
+
+#include "config.h"
+#include "vm/types.h"
+
+#include "vm/class.h"
+#include "vm/descriptor.h"
+#include "vm/field.h"
 #include "vm/global.h"
+#include "vm/method.h"
 #include "vm/utf8.h"
 
 
@@ -56,47 +95,11 @@
 /*     parseddesc                 describes a field type or a method type     */
 /*----------------------------------------------------------------------------*/
 
-/* forward declarations *******************************************************/
-
-typedef struct classinfo classinfo; 
-typedef struct methodinfo methodinfo; 
-typedef struct fieldinfo fieldinfo; 
-typedef struct typedesc typedesc;
-typedef struct methoddesc methoddesc;
-
-
 /* structs ********************************************************************/
 
-/* constant_classref **********************************************************/
-
-typedef struct constant_classref {
-       void      *pseudo_vftbl;      /* for distinguishing it from classinfo     */
-       classinfo *referer;           /* class containing the reference           */
-       utf       *name;              /* name of the class refered to             */
-} constant_classref;
-
-
-/* classref_or_classinfo ******************************************************/
-
-typedef union {
-       constant_classref *ref;       /* a symbolic class reference               */
-       classinfo         *cls;       /* an already loaded class                  */
-       void              *any;       /* used for general access (x != NULL,...)  */
-} classref_or_classinfo;
-
-
-/* parseddesc *****************************************************************/
-
-typedef union parseddesc {
-       typedesc          *fd;        /* parsed field descriptor                  */
-       methoddesc        *md;        /* parsed method descriptor                 */
-       void              *any;       /* used for simple test against NULL        */
-} parseddesc;
-
-
 /* constant_FMIref ************************************************************/
 
-typedef struct {            /* Fieldref, Methodref and InterfaceMethodref     */
+struct constant_FMIref{     /* Fieldref, Methodref and InterfaceMethodref     */
        union {
                s4                 index;     /* used only within the loader          */
                constant_classref *classref;  /* class having this field/meth./intfm. */
@@ -106,7 +109,7 @@ typedef struct {            /* Fieldref, Methodref and InterfaceMethodref     */
        utf       *name;        /* field/method/interfacemethod name              */
        utf       *descriptor;  /* field/method/intfmeth. type descriptor string  */
        parseddesc parseddesc;  /* parsed descriptor                              */
-} constant_FMIref;
+};
 
 
 /* macros *********************************************************************/