Some changes from my thesis.

[cacao.git] / global.h

diff --git a/global.h b/global.h
index f3d46fa35fdfa20741057740a9ecf986ecd5a4c4..5679647df5703e8adda1995e0b91cc61ed43ff6d 100644 (file)
--- a/global.h
+++ b/global.h
@@ -31,7 +31,7 @@
             Philipp Tomsich
                        Edwin Steiner
 
-   $Id: global.h 1442 2004-11-05 13:51:49Z twisti $
+   $Id: global.h 1510 2004-11-17 11:33:44Z twisti $
 
 */
 
@@ -95,25 +95,25 @@
 
 /* additional data types ******************************************************/
 
-typedef void *voidptr;          /* generic pointer */
+typedef void *voidptr;                  /* generic pointer                    */
+typedef void (*functionptr) ();         /* generic function pointer           */
 
-typedef int   bool;             /* boolean data type */
+typedef int   bool;                     /* boolean data type                  */
 
 #define true  1
 #define false 0
 
-typedef void (*functionptr) (); /* generic function pointer */
-
 
 /* immediate data union */
 
 typedef union {
-    s4 i;
-    s8 l;
-    float f;
-    double d;
-    void *a;
-    u1 b[8];
+       s4          i;
+       s8          l;
+       float       f;
+       double      d;
+       void       *a;
+       functionptr fp;
+       u1          b[8];
 } imm_union;
 
 
@@ -548,7 +548,7 @@ typedef struct xtainfo {
 
        methSet         *calls;            /* methods this method calls                 */ 
        methSet         *calledBy;         /* methods that call this method         */ 
-       methSet         *marked;  //not in Dez         /* methods that marked by this method    */ 
+       methSet         *marked;  /*not in Dez*/         /* methods that marked by this method    */ 
        methSet         *markedBy;
        fldSet          *fldsUsed;         /* fields used by this method             */ 
        /*methSetNode  *interfaceCalls*/   /* methods this method calls as interface */ 
@@ -614,8 +614,8 @@ struct methodinfo {                 /* method structure                       */
 
        u1         *stubroutine;        /* stub for compiling or calling natives  */
        s4          mcodelength;        /* legth of generated machine code        */
-       u1         *mcode;              /* pointer to machine code                */
-       u1         *entrypoint;         /* entry point in machine code            */
+       functionptr mcode;              /* pointer to machine code                */
+       functionptr entrypoint;         /* entry point in machine code            */
 
        /*rtainfo   rta;*/
        xtainfo    *xta;