Fix a crash in the code which tests, if a method is identifyable by name and paramete...

[cacao.git] / global.h

diff --git a/global.h b/global.h
index 1342074c01c62f04fa80b4d49d37951df6ba9c27..8081e92769597adbda5abfcdb83764f648ca3d89 100644 (file)
--- a/global.h
+++ b/global.h
@@ -31,7 +31,7 @@
             Philipp Tomsich
                        Edwin Steiner
 
-   $Id: global.h 1296 2004-07-10 17:02:15Z stefan $
+   $Id: global.h 1415 2004-10-11 20:12:08Z jowenn $
 
 */
 
@@ -68,7 +68,7 @@
  * categories for stack manipulations (POP,POP2,SWAP,DUP,DUP2,DUP_X1,
  * DUP2_X1,DUP_X2,DUP2_X2).
  */
-/* #define TYPECHECK_STACK_COMPCAT */
+#define TYPECHECK_STACK_COMPCAT
 
 /*
  * Macros for configuration of the typechecking code
@@ -81,12 +81,12 @@
  * TYPECHECK_VERBOSE activates all debug messages
  */
 #ifdef CACAO_TYPECHECK
-/*#define TYPECHECK_STATISTICS*/
-/*#define TYPEINFO_DEBUG*/
-/*#define TYPECHECK_DEBUG*/
-/*#define TYPEINFO_DEBUG_TEST*/
-/*#define TYPECHECK_VERBOSE*/
-/*#define TYPECHECK_VERBOSE_IMPORTANT*/
+/*#define TYPECHECK_STATISTICS
+#define TYPEINFO_DEBUG
+#define TYPECHECK_DEBUG
+#define TYPEINFO_DEBUG_TEST
+#define TYPECHECK_VERBOSE
+#define TYPECHECK_VERBOSE_IMPORTANT*/
 #if defined(TYPECHECK_VERBOSE) || defined(TYPECHECK_VERBOSE_IMPORTANT)
 #define TYPECHECK_VERBOSE_OPT
 #endif
@@ -102,6 +102,8 @@ typedef int   bool;             /* boolean data type */
 #define true  1
 #define false 0
 
+typedef void (*functionptr) (); /* generic function pointer */
+
 
 /* immediate data union */
 
@@ -130,8 +132,6 @@ typedef union {
 #define PRIMITIVETYPE_BOOLEAN 7
 #define PRIMITIVETYPE_VOID    8
 
-typedef void (*functionptr) (); /* generic function pointer */
-
 
 #define MAX_ALIGN 8             /* most generic alignment for JavaVM values   */
 
@@ -567,6 +567,7 @@ struct lineinfo {
 /* methodinfo *****************************************************************/
 
 struct methodinfo {                 /* method structure                       */
+       java_objectheader header;       /* we need this in jit's monitorenter     */
        s4             flags;               /* ACC flags                              */
        utf       *name;                /* name of method                         */
        utf       *descriptor;          /* JavaVM descriptor string of method     */
@@ -610,6 +611,8 @@ struct methodinfo {                 /* method structure                       */
 
        struct registerdata *registerdata; /* struct with all regalloc stuff      */
 
+       struct codegendata *codegendata;/* struct with codegen stuff              */
+
        u1        *stubroutine;         /* stub for compiling or calling natives  */
        s4         mcodelength;         /* legth of generated machine code        */
        u1        *mcode;               /* pointer to machine code                */