* src/vm/jit/parse.c (parse_resolve_exception_table): Do not use

codegendata.
(parse): Likewise.

* src/vm/jit/stack.c (stack_analyse): Likewise.

diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.c
index 433507199146ddff946022b6ab07a6a6a4b24397..e604a943136eafe8babe812a0ee8b4f8c44ef6bc 100644 (file)
--- a/src/vm/jit/parse.c
+++ b/src/vm/jit/parse.c
@@ -31,7 +31,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: parse.c 5785 2006-10-15 22:25:54Z edwin $
+   $Id: parse.c 5790 2006-10-16 09:59:52Z edwin $
 
 */
 
@@ -245,7 +245,6 @@ throw_invalid_bytecode_index:
 
 static bool parse_resolve_exception_table(jitdata *jd)
 {
-       codegendata         *cd;
        methodinfo          *m;
        raw_exception_entry *rex;
        exception_entry     *ex;
@@ -254,7 +253,6 @@ static bool parse_resolve_exception_table(jitdata *jd)
        classinfo           *exclass;
 
        m = jd->m;
-       cd = jd->cd;
 
        len = m->rawexceptiontablelength;
 
@@ -337,7 +335,6 @@ bool parse(jitdata *jd)
 {
        methodinfo  *m;                     /* method being parsed                */
        codeinfo    *code;
-       codegendata *cd;
        parsedata_t  pd;
        instruction *iptr;                  /* current ptr into instruction array */
        s4           ipc;                   /* intermediate instruction counter   */
@@ -370,11 +367,10 @@ bool parse(jitdata *jd)
 
        m    = jd->m;
        code = jd->code;
-       cd   = jd->cd;
 
        /* allocate buffers for local variable renaming */
-       local_map = DMNEW(int, cd->maxlocals * 5);
-       for (i = 0; i < cd->maxlocals; i++) {
+       local_map = DMNEW(int, m->maxlocals * 5);
+       for (i = 0; i < m->maxlocals; i++) {
                local_map[i * 5 + 0] = 0;
                local_map[i * 5 + 1] = 0;
                local_map[i * 5 + 2] = 0;
@@ -1658,7 +1654,7 @@ invoke_method:
                /* iterate over local_map[0..m->maxlocals*5] and set all existing  */
                /* index,type pairs (local_map[index*5+type]==1) to an unique value */
                /* -> == new local var index */
-               for(i = 0; i < (cd->maxlocals * 5); i++, mapptr++) {
+               for(i = 0; i < (m->maxlocals * 5); i++, mapptr++) {
                        if (*mapptr)
                                *mapptr = nlocals++;
                        else
@@ -1699,7 +1695,7 @@ invoke_method:
 
                /* set types of all locals in jd->var */
 
-               for(mapptr = local_map, i = 0; i < (cd->maxlocals * 5); i++, mapptr++)
+               for(mapptr = local_map, i = 0; i < (m->maxlocals * 5); i++, mapptr++)
                        if (*mapptr != UNUSED)
                                VAR(*mapptr)->type = i%5;
        }

diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index 14e3cdc3b7e48dd45f3c7d45a72da2e0c43baf31..8924b8d05ecbc841eeb1b60444f8664015571ba0 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -30,7 +30,7 @@
             Christian Thalinger
             Christian Ullrich
 
-   $Id: stack.c 5785 2006-10-15 22:25:54Z edwin $
+   $Id: stack.c 5790 2006-10-16 09:59:52Z edwin $
 
 */
 
@@ -1929,7 +1929,6 @@ bool stack_analyse(jitdata *jd)
 {
        methodinfo   *m;              /* method being analyzed                    */
        codeinfo     *code;
-       codegendata  *cd;
        registerdata *rd;
        stackdata_t   sd;
 #if defined(ENABLE_SSA)
@@ -1976,7 +1975,6 @@ bool stack_analyse(jitdata *jd)
 
        m    = jd->m;
        code = jd->code;
-       cd   = jd->cd;
        rd   = jd->rd;
 #if defined(ENABLE_SSA)
        ls   = jd->ls;
@@ -2031,7 +2029,7 @@ bool stack_analyse(jitdata *jd)
        for (i = 0; i < m->maxstack * 5; i++)
                jd->interface_map[i].flags = UNUSED;
 
-       last_store_boundary = DMNEW(stackptr, cd->maxlocals);
+       last_store_boundary = DMNEW(stackptr, m->maxlocals);
 
        /* initialize flags and invars (none) of first block */
 
@@ -2165,7 +2163,7 @@ bool stack_analyse(jitdata *jd)
                                /* reset variables for dependency checking */
 
                                coalescing_boundary = sd.new;
-                               for( i = 0; i < cd->maxlocals; i++)
+                               for( i = 0; i < m->maxlocals; i++)
                                        last_store_boundary[i] = sd.new;
 
                                /* remember the start of this block's variables */