Lazy checkcast and instanceof.

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

diff --git a/src/vm/jit/jit.h b/src/vm/jit/jit.h
index 2a8ddab4e6132c2ae93e2f7ffd788b904da82507..e6f0bd7b51597744ce107c6169c4348eb59e2e7f 100644 (file)
--- a/src/vm/jit/jit.h
+++ b/src/vm/jit/jit.h
@@ -1,9 +1,9 @@
-/* jit/jit.h - code generation header
+/* src/vm/jit/jit.h - code generation header
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   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
 
    This file is part of CACAO.
 
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: jit.h 1456 2004-11-05 14:33:14Z twisti $
+   $Id: jit.h 2181 2005-04-01 16:53:33Z edwin $
 
 */
 
@@ -37,14 +37,7 @@
 #ifndef _JIT_H
 #define _JIT_H
 
-#include "global.h"
-#include "builtin.h"
-#include "typeinfo.h"
-#include "jit/codegen.inc.h"
-#include "toolbox/chain.h"
-
-
-/**************************** resolve typedef-cycles **************************/
+/* resolve typedef cycles *****************************************************/
 
 typedef struct stackelement stackelement;
 typedef stackelement *stackptr;
@@ -53,6 +46,16 @@ typedef struct instruction instruction;
 typedef struct subroutineinfo subroutineinfo;
 
 
+#include "toolbox/chain.h"
+#include "vm/global.h"
+#include "vm/references.h"
+#include "vm/method.h"
+#include "vm/jit/codegen.inc.h"
+#include "vm/jit/verify/typeinfo.h"
+
+
+/**************************** resolve typedef-cycles **************************/
+
 /************************** stack element structure ***************************/
 
 /* slot types */
@@ -66,9 +69,10 @@ typedef struct subroutineinfo subroutineinfo;
 #define TYPE_DBL   TYPE_DOUBLE  /*3*/  /* integer, long, float, double, address      */
 #define TYPE_ADR   TYPE_ADDRESS /*4*/
 
-#define IS_INT_LNG_TYPE(a)      (!((a)&TYPE_FLT))
-#define IS_FLT_DBL_TYPE(a)      ((a)&TYPE_FLT)
-#define IS_2_WORD_TYPE(a)       ((a)&TYPE_LNG)
+#define IS_INT_LNG_TYPE(a)      (!((a) & TYPE_FLT))
+#define IS_FLT_DBL_TYPE(a)      ((a) & TYPE_FLT)
+#define IS_2_WORD_TYPE(a)       ((a) & TYPE_LNG)
+#define IS_ADR_TYPE(a)          ((a) & TYPE_ADR)
 
 
 /* flags */
@@ -112,19 +116,31 @@ struct instruction {
        u2          line;           /* line number in source file                 */
        methodinfo *method;         /* needed for inlining. can't be done on      */
                                    /* basic block level, since an inlined        */
-                                   /* function doesn't start necessarily start   */
+                                   /* function doesn't necessarily start         */
                                    /* a new block                                */
 };
 
+#define INSTRUCTION_PUTCONST_TYPE(iptr) \
+       ((iptr)[0].op1)
+
+#define INSTRUCTION_PUTCONST_VALUE_ADR(iptr) \
+       ((iptr)[0].val.a)
+
+#define INSTRUCTION_PUTCONST_FIELDINFO(iptr) \
+       ((fieldinfo *)((iptr)[1].val.a))
+
+#define INSTRUCTION_PUTCONST_FIELDREF(iptr) \
+       ((constant_FMIref *)((iptr)[1].val.a))
+
 
 /**************************** basic block structure ***************************/
  
 /*                    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
 
@@ -779,6 +795,16 @@ extern int jcommandsize[256];
 
 #define ICMD_SASTORECONST     211
 
+#define ICMD_PUTSTATICCONST   212
+
+#define ICMD_PUTFIELDCONST    213
+
+#define ICMD_IMULPOW2         214
+
+#define ICMD_LMULPOW2         215
+
+#define ICMD_INLINE_START     251       /* before the first instruction of an inlined method */
+#define ICMD_INLINE_END       252       /* after the last instruction of an inlined method */
 #define ICMD_BUILTIN3         253       /* internal opcode */
 #define ICMD_BUILTIN2         254       /* internal opcode */
 #define ICMD_BUILTIN1         255       /* internal opcode */
@@ -788,11 +814,6 @@ extern int jcommandsize[256];
 
 /******************* description of JavaVM instructions ***********************/
 
-#if defined(USEBUILTINTABLE)
-
-builtin_descriptor *find_builtin(int opcode);
-
-#endif /* USEBUILTINTABLE */
 
 
 /***************************** register types *********************************/
@@ -815,27 +836,15 @@ builtin_descriptor *find_builtin(int opcode);
 extern int stackreq[256];
 
 
-#if defined(__I386__)
-extern bool method_uses_ecx;
-extern bool method_uses_edx;
-#endif
-
-
-/* function prototypes */
+/* function prototypes ********************************************************/
 
-methodptr jit_compile(methodinfo *m);   /* compile a method with jit compiler */
+functionptr jit_compile(methodinfo *m); /* compile a method with jit compiler */
 
 void jit_init();                        /* compiler initialisation            */
 void jit_close();                       /* compiler finalisation              */
 
 void compile_all_class_methods(classinfo *c);
 
-u1 *createcompilerstub(methodinfo *m);
-u1 *createnativestub(functionptr f, methodinfo *m);
-
-void removecompilerstub(u1 *stub);
-void removenativestub(u1 *stub);
-
 #endif /* _JIT_H */