GNU header update.

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

diff --git a/src/vm/jit/jit.h b/src/vm/jit/jit.h
index 2a8ddab4e6132c2ae93e2f7ffd788b904da82507..fd726ed4267f116b12c4c98eb09364d1032e2c6d 100644 (file)
--- a/src/vm/jit/jit.h
+++ b/src/vm/jit/jit.h
@@ -1,9 +1,9 @@
 /* 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 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
@@ -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,15 @@ typedef struct instruction instruction;
 typedef struct subroutineinfo subroutineinfo;
 
 
+#include "toolbox/chain.h"
+#include "vm/global.h"
+#include "vm/builtin.h"
+#include "vm/jit/codegen.inc.h"
+#include "vm/jit/verify/typeinfo.h"
+
+
+/**************************** resolve typedef-cycles **************************/
+
 /************************** stack element structure ***************************/
 
 /* slot types */
@@ -112,7 +114,7 @@ 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                                */
 };
 
@@ -779,6 +781,8 @@ extern int jcommandsize[256];
 
 #define ICMD_SASTORECONST     211
 
+#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 */
@@ -823,7 +827,7 @@ extern bool method_uses_edx;
 
 /* 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              */