* Removed all Id tags.

[cacao.git] / src / vm / jit / verify / typecheck-common.h

diff --git a/src/vm/jit/verify/typecheck-common.h b/src/vm/jit/verify/typecheck-common.h
index 09258b47fa17be029958eaaf5fd35e243ce9fe26..ac91170dc7e9e4fa25d7d70e4ec44ce5c3d93899 100644 (file)
--- a/src/vm/jit/verify/typecheck-common.h
+++ b/src/vm/jit/verify/typecheck-common.h
@@ -28,8 +28,6 @@
 
    Changes:
 
-   $Id$
-
 */
 
 
@@ -119,7 +117,7 @@ void typecheck_print_vararray(FILE *file, jitdata *jd, s4 *vars, int len);
 /* STATISTICS                                                               */
 /****************************************************************************/
 
-#ifdef TYPECHECK_DEBUG
+#if defined(TYPECHECK_DEBUG) && !defined(TYPECHECK_NO_STATISTICS)
 /*#define TYPECHECK_STATISTICS*/
 #endif
 
@@ -196,6 +194,15 @@ void typecheck_print_statistics(FILE *file);
 #define TYPECHECK_VERIFYERROR_bool(msg)  TYPECHECK_VERIFYERROR_ret(state->m,(msg),false)
 
 
+/****************************************************************************/
+/* MISC MACROS                                                              */
+/****************************************************************************/
+
+#define COPYTYPE(source,dest)                                        \
+    {if (VAROP(source)->type == TYPE_ADR)                            \
+            TYPEINFO_COPY(VAROP(source)->typeinfo,VAROP(dest)->typeinfo);}
+
+
 /****************************************************************************/
 /* JSR VERIFICATION (stack-based verifier)                                  */
 /****************************************************************************/
@@ -250,7 +257,7 @@ typedef struct verifier_state {
 
        s4 exinvars;
        
-    exceptiontable **handlers;            /* active exception handlers */
+    exception_entry **handlers;           /* active exception handlers */
        
     bool repeat;            /* if true, blocks are iterated over again */
     bool initmethod;             /* true if this is an "<init>" method */
@@ -274,6 +281,25 @@ typedef struct verifier_state {
 void typecheck_init_flags(verifier_state *state, s4 minflags);
 void typecheck_reset_flags(verifier_state *state);
 
+bool typecheck_copy_types(verifier_state *state,
+                                                 s4 *srcvars, s4 *dstvars, s4 n);
+
+typecheck_result typecheck_merge_types(verifier_state *state,
+                                                                          s4 *srcvars,
+                                                                          s4 *dstvars,
+                                                                          s4 n);
+
+typecheck_result typestate_merge(verifier_state *state,
+                                                s4 *srcvars, varinfo *srclocals,
+                                                s4 *dstvars, varinfo *dstlocals,
+                                                s4 n);
+
+bool typestate_reach(verifier_state *state,
+                                        basicblock *destblock,
+                                        s4 *srcvars, varinfo *srclocals, s4 n);
+
+bool typecheck_init_locals(verifier_state *state, bool newthis);
+
 #endif /* _TYPECHECK_COMMON_H */
 
 /*