* builtin_trace_args: remaining paramcount fix

[cacao.git] / src / vm / method.h

diff --git a/src/vm/method.h b/src/vm/method.h
index 9595c9268f1e78d953edb75635c32121a5a431f9..7fd5a797f3c0f16b6d2e3c5b90c9a89088573edf 100644 (file)
--- a/src/vm/method.h
+++ b/src/vm/method.h
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: method.h 2184 2005-04-01 21:19:05Z edwin $
+   $Id: method.h 2666 2005-06-13 14:23:06Z twisti $
 */
 
 
@@ -93,7 +93,7 @@ struct methodinfo {                 /* method structure                       */
        exceptiontable *exceptiontable; /* the exceptiontable                     */
 
        u2          thrownexceptionscount;/* number of exceptions attribute       */
-       classinfo **thrownexceptions;   /* checked exceptions a method may throw  */
+       classref_or_classinfo *thrownexceptions; /* except. a method may throw    */
 
        u2          linenumbercount;    /* number of linenumber attributes        */
        lineinfo   *linenumbers;        /* array of lineinfo items                */
@@ -101,7 +101,7 @@ struct methodinfo {                 /* method structure                       */
        int       c_debug_nr;           /* a counter to number all BB with an     */
                                        /* unique value                           */
 
-       u1         *stubroutine;        /* stub for compiling or calling natives  */
+       functionptr stubroutine;        /* stub for compiling or calling natives  */
        s4          mcodelength;        /* legth of generated machine code        */
        functionptr mcode;              /* pointer to machine code                */
        functionptr entrypoint;         /* entry point in machine code            */
@@ -117,7 +117,9 @@ struct methodinfo {                 /* method structure                       */
        s4              subRedefsUsed;
        s4              nativelyoverloaded; /* used in header.c and only valid there  */
        /* helper for lsra */
+#ifdef LSRA
        s4          maxlifetimes;
+#endif
 };
 
 
@@ -133,7 +135,7 @@ struct exceptiontable {         /* exceptiontable entry in a method           */
        s4              handlerpc;  /* pc of exception handler                    */
        basicblock     *handler;
 
-       classinfo      *catchtype;  /* catchtype of exception (NULL == catchall)  */
+       classref_or_classinfo catchtype; /* catchtype of exc. (NULL == catchall)  */
        exceptiontable *next;       /* used to build a list of exception when     */
                                    /* loops are copied */
        exceptiontable *down;       /* instead of the old array, a list is used   */