* src/vm/method.h (methodinfo): Renamed executioncount to

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

diff --git a/src/vm/jit/jit.h b/src/vm/jit/jit.h
index e82a986b0b65e29c65c34734aa7f4c2c150ad4e5..3775fe707064bb3146994519050d44879c94b49f 100644 (file)
--- a/src/vm/jit/jit.h
+++ b/src/vm/jit/jit.h
@@ -1,9 +1,9 @@
 /* src/vm/jit/jit.h - code generation header
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,17 +19,17 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Andreas Krall
             Reinhard Grafl
 
    Changes: Christian Thalinger
 
-   $Id: jit.h 3996 2005-12-22 14:01:34Z twisti $
+   $Id: jit.h 4398 2006-01-31 23:43:08Z twisti $
 
 */
 
@@ -54,7 +54,7 @@ typedef struct subroutineinfo subroutineinfo;
 #include "vm/method.h"
 #include "vm/references.h"
 #include "vm/statistics.h"
-#include "vm/jit/codegen.inc.h"
+#include "vm/jit/codegen-common.h"
 #include "vm/jit/verify/typeinfo.h"
 
 
@@ -149,40 +149,42 @@ struct instruction {
 #define INSTRUCTION_PUTCONST_FIELDREF(iptr) \
        ((unresolved_field *)((iptr)[1].target))
 
-/**************************** basic block structure ***************************/
+
+/* basicblock *****************************************************************/
  
-/*                    flags                                                   */
+/* flags */
+
+#define BBDELETED            -2
+#define BBUNDEF              -1
+#define BBREACHED            0
+#define BBFINISHED           1
 
-#define BBDELETED     -2
-#define BBUNDEF       -1
-#define BBREACHED     0
-#define BBFINISHED    1
 #define BBTYPECHECK_UNDEF    2
 #define BBTYPECHECK_REACHED  3
 
-#define BBTYPE_STD 0            /* standard basic block type                  */
-#define BBTYPE_EXH 1            /* exception handler basic block type         */
-#define BBTYPE_SBR 2            /* subroutine basic block type                */
+#define BBTYPE_STD           0  /* standard basic block type                  */
+#define BBTYPE_EXH           1  /* exception handler basic block type         */
+#define BBTYPE_SBR           2  /* subroutine basic block type                */
 
 
 struct basicblock {
-       int          flags;         /* used during stack analysis, init with -1   */
-       int          type;          /* basic block type (std, xhandler, subroutine*/
+       s4           debug_nr;      /* basic block number                         */
+       s4           flags;         /* used during stack analysis, init with -1   */
+       s4           type;          /* basic block type (std, xhandler, subroutine*/
        instruction *iinstr;        /* pointer to intermediate code instructions  */
-       int          icount;        /* number of intermediate code instructions   */
-       int          mpc;           /* machine code pc at start of block          */
+       s4           icount;        /* number of intermediate code instructions   */
+       s4           mpc;           /* machine code pc at start of block          */
        stackptr     instack;       /* stack at begin of basic block              */
        stackptr     outstack;      /* stack at end of basic block                */
-       int          indepth;       /* stack depth at begin of basic block        */
-       int          outdepth;      /* stack depth end of basic block             */
-       int          pre_count;     /* count of predecessor basic blocks          */
-       struct branchref *branchrefs; /* list of branches to be patched           */
+       s4           indepth;       /* stack depth at begin of basic block        */
+       s4           outdepth;      /* stack depth end of basic block             */
+       s4           pre_count;     /* count of predecessor basic blocks          */
+       branchref   *branchrefs;    /* list of branches to be patched             */
 
        basicblock  *next;          /* used to build a BB list (instead of array) */
-       int          lflags;        /* used during loop copying, init with 0      */
+       s4           lflags;        /* used during loop copying, init with 0      */
        basicblock  *copied_to;     /* points to the copy of this basic block     */
                                 /* when loop nodes are copied                 */
-       int debug_nr;
 };
 
 
@@ -864,7 +866,13 @@ void jit_close(void);
 u1 *jit_compile(methodinfo *m);
 
 /* machine dependent initialization */
+#if defined(ENABLE_JIT)
 void md_init(void);
+#endif
+
+#if defined(ENABLE_INTRP)
+void intrp_md_init(void);
+#endif
 
 #endif /* _JIT_H */