* Removed all Id tags.

[cacao.git] / src / vm / jit / verify / typecheck-stackbased.c

diff --git a/src/vm/jit/verify/typecheck-stackbased.c b/src/vm/jit/verify/typecheck-stackbased.c
index a79f6b1a124aa2a234af4f3f62d805e461702552..ac4377507fa248d44db0df275d8698b4f8587dbb 100644 (file)
--- a/src/vm/jit/verify/typecheck-stackbased.c
+++ b/src/vm/jit/verify/typecheck-stackbased.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/verify/typecheck-stackbased.c - stack-based verifier
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   Copyright (C) 1996-2005, 2006, 2007 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
@@ -22,26 +22,27 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
+*/
 
-   Authors: Edwin Steiner
 
-   Changes: 
+#include "config.h"
 
-   $Id$
+#include <assert.h>
 
-*/
+#include "vm/types.h"
 
+#include "vm/builtin.h"
+#include "mm/memory.h"
 
-#include "config.h"
-#include "vm/types.h"
+#include "vm/array.h"
 #include "vm/global.h"
+#include "vm/primitive.h"
 
-#include <assert.h>
+#include "vm/jit/parse.h"
+#include "vm/jit/show.h"
+#include "vm/jit/stack.h"
+#include "vm/jit/verify/typecheck-common.h"
 
-#include <vm/jit/stack.h>
-#include <vm/jit/show.h>
-#include <typecheck-common.h>
 
 /* this #if runs over the whole file: */
 #if defined(ENABLE_VERIFIER)
@@ -106,7 +107,7 @@ static void typecheck_stackbased_show_state(verifier_state *state,
 #define VERIFY_ERROR(msg)                                            \
     do {                                                             \
         LOG1("VerifyError: %s", msg);                                \
-        exceptions_throw_verifyerror(state.m, msg);                  \
+        exceptions_throw_verifyerror(STATE->m, msg);                 \
         return false;                                                \
     } while (0)
 
@@ -140,8 +141,7 @@ static void typecheck_stackbased_show_state(verifier_state *state,
 
 #define REACH(target)                                                \
     do {                                                             \
-        tbptr = BLOCK_OF((target).insindex);                         \
-        REACH_BLOCK(tbptr);                                          \
+        REACH_BLOCK((target).block);                                 \
     } while (0)
 
 #undef TYPECHECK_INT
@@ -543,7 +543,7 @@ static typedescriptor *typecheck_stackbased_jsr(verifier_state *state,
 
        jd = state->jd;
 
-       tbptr = BLOCK_OF(state->iptr->sx.s23.s3.jsrtarget.insindex);
+       tbptr = state->iptr->sx.s23.s3.jsrtarget.block;
        jsr = state->jsrinfos[tbptr->nr];
 
        if (jsr && tbptr->flags == BBFINISHED) {
@@ -598,15 +598,18 @@ static typedescriptor *typecheck_stackbased_jsr(verifier_state *state,
                jsr->next = state->topjsr;
                state->topjsr = jsr;
 
-               /* XXX ugly */
-               assert(BLOCK_OF(state->iptr->sx.s23.s3.jsrtarget.insindex)->flags == BBTYPECHECK_REACHED);
+               assert(state->iptr->sx.s23.s3.jsrtarget.block->flags == BBTYPECHECK_REACHED);
+
                tbptr->flags = BBFINISHED;
+
                for (tbptr = state->basicblocks; tbptr != NULL; tbptr = tbptr->next) {
                        jsr->blockflags[tbptr->nr] = tbptr->flags;
+
                        if (tbptr->flags == BBTYPECHECK_REACHED)
                                tbptr->flags = BBFINISHED;
                }
-               BLOCK_OF(state->iptr->sx.s23.s3.jsrtarget.insindex)->flags = BBTYPECHECK_REACHED;
+
+               state->iptr->sx.s23.s3.jsrtarget.block->flags = BBTYPECHECK_REACHED;
        }
 
        /* register this block as a caller, if not already done */
@@ -698,7 +701,7 @@ bool typecheck_stackbased(jitdata *jd)
        verifier_slot_t *dst;
        verifier_state state;
        basicblock *tbptr;
-       exceptiontable *ex;
+       exception_entry *ex;
        typedescriptor exstack;
        s4 skip = 0;
 
@@ -714,6 +717,12 @@ bool typecheck_stackbased(jitdata *jd)
        state.topjsr = NULL;
 #   define STATE (&state)
 
+       /* check that the basicblock numbers are valid */
+
+#if !defined(NDEBUG)
+       jit_check_basicblock_numbers(jd);
+#endif
+
        /* check if this method is an instance initializer method */
 
     state.initmethod = (state.m->name == utf_init);
@@ -744,7 +753,7 @@ bool typecheck_stackbased(jitdata *jd)
 
     /* allocate the buffer of active exception handlers */
 
-    state.handlers = DMNEW(exceptiontable*, state.cd->exceptiontablelength + 1);
+    state.handlers = DMNEW(exception_entry*, state.jd->exceptiontablelength + 1);
 
     /* initialize instack of exception handlers */
 
@@ -821,7 +830,7 @@ bool typecheck_stackbased(jitdata *jd)
                        /* something?                                             */
                        /* XXX reuse code from variables based verifer? */
                        len = 0;
-                       for (ex = STATE->cd->exceptiontable; ex ; ex = ex->down) {
+                       for (ex = STATE->jd->exceptiontable; ex ; ex = ex->down) {
                                if ((ex->start->nr <= STATE->bptr->nr) && (ex->end->nr > STATE->bptr->nr)) {
                                        LOG1("\tactive handler L%03d", ex->handler->nr);
                                        STATE->handlers[len++] = ex;