* src/vm/jit/powerpc/linux/md-abi.c: Use VAR and VAROP macros.

* src/vm/jit/powerpc/darwin/md-abi.c: Likewise.
* src/vm/jit/alpha/codegen.c: Likewise.
* src/vm/jit/alpha/codegen.h: Likewise.
* src/vm/jit/alpha/md-abi.c: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/verify/typecheck.c: Likewise.
* src/vm/jit/allocator/simplereg.c: Likewise.
* src/vm/jit/i386/codegen.h: Likewise.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/x86_64/emit.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.h: Likewise.
* src/vm/jit/x86_64/md-abi.c: Likewise.
* src/vm/jit/codegen-common.c: Likewise.

--HG--
branch : unified_variables

diff --git a/src/vm/jit/allocator/simplereg.c b/src/vm/jit/allocator/simplereg.c
index 6a9854eda3ee5664a0cb98fa6b87462c8b246370..a46897dc897114ea780a7834534f86a8539f444f 100644 (file)
--- a/src/vm/jit/allocator/simplereg.c
+++ b/src/vm/jit/allocator/simplereg.c
@@ -32,7 +32,7 @@
             Michael Starzinger
             Edwin Steiner
 
-   $Id: simplereg.c 5584 2006-09-29 14:02:39Z edwin $
+   $Id: simplereg.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -436,7 +436,7 @@ static void local_regalloc(jitdata *jd)
                                if (lm == UNUSED)
                                        continue;
 
-                               v = &(jd->var[lm]);
+                               v = VAR(lm);
 
 #if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
                                intregsneeded = (IS_2_WORD_TYPE(t)) ? 1 : 0;
@@ -490,8 +490,8 @@ static void local_regalloc(jitdata *jd)
 #endif
                                        if (IS_FLT_DBL_TYPE(t)) {
                                                if (fltalloc >= 0) {
-                                                       v->flags = jd->var[fltalloc].flags;
-                                                       v->vv.regoff = jd->var[fltalloc].vv.regoff;
+                                                       v->flags = VAR(fltalloc)->flags;
+                                                       v->vv.regoff = VAR(fltalloc)->vv.regoff;
                                                }
 #if !defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
                                                /* We can only use float arguments as local variables,
@@ -547,15 +547,15 @@ static void local_regalloc(jitdata *jd)
 #endif
                                                {
                                                        if (intalloc >= 0) {
-                                                               v->flags = jd->var[intalloc].flags;
+                                                               v->flags = VAR(intalloc)->flags;
 #if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
                                                                if (!(v->flags & INMEMORY)
-                                                                       && IS_2_WORD_TYPE(jd->var[intalloc].type))
+                                                                       && IS_2_WORD_TYPE(VAR(intalloc)->type))
                                                                        v->vv.regoff = GET_LOW_REG(
-                                                                                                       jd->var[intalloc].vv.regoff);
+                                                                                                       VAR(intalloc)->vv.regoff);
                                                                else
 #endif
-                                                                       v->vv.regoff = jd->var[intalloc].vv.regoff;
+                                                                       v->vv.regoff = VAR(intalloc)->vv.regoff;
                                                        }
                                                        else if ((p < md->paramcount) && 
                                                                         !md->params[p].inmemory) {
@@ -648,7 +648,7 @@ static void local_regalloc(jitdata *jd)
                        if (lm == UNUSED)
                                continue;
 
-                       v = &(jd->var[lm]);
+                       v = VAR(lm);
 
 #ifdef SUPPORT_COMBINE_INTEGER_REGISTERS
                                intregsneeded = (IS_2_WORD_TYPE(t)) ? 1 : 0;
@@ -670,8 +670,8 @@ static void local_regalloc(jitdata *jd)
 #endif
                                if (IS_FLT_DBL_TYPE(t)) {
                                        if (fltalloc >= 0) {
-                                               v->flags = jd->var[fltalloc].flags;
-                                               v->vv.regoff = jd->var[fltalloc].vv.regoff;
+                                               v->flags = VAR(fltalloc)->flags;
+                                               v->vv.regoff = VAR(fltalloc)->vv.regoff;
                                        }
                                        else if (rd->savfltreguse > 0) {
                                                v->flags = 0;
@@ -706,15 +706,15 @@ static void local_regalloc(jitdata *jd)
                                        } else {
 #endif
                                                if (intalloc >= 0) {
-                                                       v->flags = jd->var[intalloc].flags;
+                                                       v->flags = VAR(intalloc)->flags;
 #if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
                                                        if (!(v->flags & INMEMORY)
-                                                               && IS_2_WORD_TYPE(jd->var[intalloc].type))
+                                                               && IS_2_WORD_TYPE(VAR(intalloc)->type))
                                                                v->vv.regoff = GET_LOW_REG(
-                                                                                           jd->var[intalloc].vv.regoff);
+                                                                                           VAR(intalloc)->vv.regoff);
                                                        else
 #endif
-                                                               v->vv.regoff = jd->var[intalloc].vv.regoff;
+                                                               v->vv.regoff = VAR(intalloc)->vv.regoff;
                                                }
                                                else if (rd->savintreguse > intregsneeded) {
                                                        rd->savintreguse -= intregsneeded+1;
@@ -786,8 +786,8 @@ static void reg_init_temp(jitdata *jd, registerdata *rd)
 
 #define reg_new_temp(jd,index) \
        if ( (index >= jd->localcount) \
-                && (!(jd->var[index].flags & OUTVAR))   \
-                && (!(jd->var[index].flags & PREALLOC)) )      \
+                && (!(VAR(index)->flags & OUTVAR))      \
+                && (!(VAR(index)->flags & PREALLOC)) ) \
                reg_new_temp_func(jd, index)
 
 static void reg_new_temp_func(jitdata *jd, s4 index)
@@ -799,7 +799,7 @@ static void reg_new_temp_func(jitdata *jd, s4 index)
        varinfo      *v;
 
        rd = jd->rd;
-       v = &(jd->var[index]);
+       v = VAR(index);
 
        /* Try to allocate a saved register if there is no temporary one          */
        /* available. This is what happens during the second run.                 */
@@ -995,7 +995,7 @@ static void reg_new_temp_func(jitdata *jd, s4 index)
 
 #define reg_free_temp(jd,index)                                      \
     if ((index > jd->localcount)                                     \
-        && (!(jd->var[index].flags & (OUTVAR | PREALLOC))))          \
+        && (!(VAR(index)->flags & (OUTVAR | PREALLOC))))          \
         reg_free_temp_func(jd, index)
 
 /* Do not free regs/memory locations used by Stackslots flagged STCOPY! There is still another Stackslot */
@@ -1009,7 +1009,7 @@ static void reg_free_temp_func(jitdata *jd, s4 index)
        varinfo *v;
 
        rd = jd->rd;
-       v = &(jd->var[index]);
+       v = VAR(index);
 
        /* if this is a copy of another variable, just decrement the copy counter */
 
@@ -1194,7 +1194,7 @@ static void new_allocate_scratch_registers(jitdata *jd)
 
                        for (i=0; i<bptr->indepth; ++i) 
                        {
-                               v = jd->var + bptr->invars[i];
+                               v = VAR(bptr->invars[i]);
 
                                v->vv.regoff = jd->interface_map[5*i + v->type].regoff;
                                v->flags  = jd->interface_map[5*i + v->type].flags;
@@ -1204,7 +1204,7 @@ static void new_allocate_scratch_registers(jitdata *jd)
 
                        for (i=0; i<bptr->outdepth; ++i) 
                        {
-                               v = jd->var + bptr->outvars[i];
+                               v = VAR(bptr->outvars[i]);
 
                                v->vv.regoff = jd->interface_map[5*i + v->type].regoff;
                                v->flags  = jd->interface_map[5*i + v->type].flags;
@@ -1223,7 +1223,7 @@ static void new_allocate_scratch_registers(jitdata *jd)
                                case ICMD_JSR:
 #if !defined(NDEBUG)
                                        /* avoid problems with show_allocation */
-                                       jd->var[iptr->dst.varindex].vv.regoff = 0;
+                                       VAROP(iptr->dst)->vv.regoff = 0;
 #endif
                                case ICMD_NOP:
                                case ICMD_CHECKNULL:

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index 85d81852e63193d824c6ebfc4686f68ec7efbaa5..3f8669f7f270e544db5d936e54ed41f746a5bcb7 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -32,7 +32,7 @@
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 5588 2006-09-30 11:04:41Z christian $
+   $Id: codegen.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -2766,7 +2766,7 @@ gen_method:
 
                        for (s3 = s3 - 1; s3 >= 0; s3--) {
                                s1 = iptr->sx.s23.s2.args[s3];
-                               var1 = jd->var + s1;
+                               var1 = VAR(s1);
 
                                /* Already Preallocated (ARGVAR) ? */
                                if (var1->flags & PREALLOC)
@@ -3249,7 +3249,7 @@ gen_method:
                        for (s1 = iptr->s1.argcount; --s1 >= 0; ) {
 
                                s3 = iptr->sx.s23.s2.args[s1];
-                               var1 = jd->var + s3;
+                               var1 = VAR(s3);
        
                                /* copy SAVEDVAR sizes to stack */
 

diff --git a/src/vm/jit/alpha/codegen.h b/src/vm/jit/alpha/codegen.h
index f41219a8efd37ff3fff65d4bf77dc614c5f3da9b..3f3ca0765ec07adb5bde218cf2dd907099d3c201 100644 (file)
--- a/src/vm/jit/alpha/codegen.h
+++ b/src/vm/jit/alpha/codegen.h
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: codegen.h 5518 2006-09-15 16:31:47Z christian $
+   $Id: codegen.h 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -101,7 +101,7 @@
     } while (0)
 
 
-#define M_COPY(s,d)        emit_copy(jd, iptr, &(jd->var[(s)]), &(jd->var[(d)]))
+#define M_COPY(s,d)        emit_copy(jd, iptr, VAR(s), VAR(d))
 #define ICONST(d,c)        emit_iconst(cd, (d), (c))
 #define LCONST(d,c)        emit_lconst(cd, (d), (c))
 

diff --git a/src/vm/jit/alpha/md-abi.c b/src/vm/jit/alpha/md-abi.c
index 38e1bfcc2cc5b60bbd8f02e5b148d6b41ba1cecc..51c501dcb8030e15ab72bcc22a947e4592b1978e 100644 (file)
--- a/src/vm/jit/alpha/md-abi.c
+++ b/src/vm/jit/alpha/md-abi.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Ullrich
 
-   $Id: md-abi.c 5518 2006-09-15 16:31:47Z christian $
+   $Id: md-abi.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -178,14 +178,14 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
 /*             stackslot->varnum  = -1; */
 /*             stackslot->flags   = 0; */
 
-               jd->var[stackslot->varnum].flags = PREALLOC;
+               VAR(stackslot->varnum)->flags = PREALLOC;
 
                if (IS_INT_LNG_TYPE(md->returntype.type))
 /*                     stackslot->regoff = REG_RESULT; */
-                       jd->var[stackslot->varnum].vv.regoff = REG_RESULT;
+                       VAR(stackslot->varnum)->vv.regoff = REG_RESULT;
                else
 /*                     stackslot->regoff = REG_FRESULT; */
-                       jd->var[stackslot->varnum].vv.regoff = REG_FRESULT;
+                       VAR(stackslot->varnum)->vv.regoff = REG_FRESULT;
        }
 }
 

diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 6efc7db4d5e9ef8e7c54b2e23ca8c25264b2af03..608c36d306bf1ac48e621f830b96d7a31486ec8e 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -48,7 +48,7 @@
    memory. All functions writing values into the data area return the offset
    relative the begin of the code area (start of procedure).   
 
-   $Id: codegen-common.c 5463 2006-09-11 14:37:06Z edwin $
+   $Id: codegen-common.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -1142,7 +1142,7 @@ s4 codegen_reg_of_var(u2 opcode, varinfo *v, s4 tempregnum)
 
 s4 codegen_reg_of_dst(jitdata *jd, instruction *iptr, s4 tempregnum)
 {
-       varinfo *v = &jd->var[iptr->dst.varindex];
+       varinfo *v = VAROP(iptr->dst);
 
        if (!(v->flags & INMEMORY)) {
                

diff --git a/src/vm/jit/i386/codegen.h b/src/vm/jit/i386/codegen.h
index 7ed2dc67a7c11dee17d01299013ca0bcdab30ded..356e14a42508d8856e0ae00c6fa18d88a54cc7fe 100644 (file)
--- a/src/vm/jit/i386/codegen.h
+++ b/src/vm/jit/i386/codegen.h
@@ -29,7 +29,7 @@
 
    Changes:
 
-   $Id: codegen.h 5426 2006-09-08 16:02:40Z edwin $
+   $Id: codegen.h 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -148,7 +148,7 @@
 #define M_COPY(from,to) _M_COPY((from),(to));
 #endif
 
-#define _M_COPY(s,d)    emit_copy(jd, iptr, &(jd->var[(s)]), &(jd->var[(d)]))
+#define _M_COPY(s,d)    emit_copy(jd, iptr, VAR(s), VAR(d))
 
 #define ICONST(d,c) \
     do { \

diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.c
index c182b63eced373247ae4a02369c020f4163ad7bf..e3652aec50e2f90ac5a29a5ad4e4059056301b8e 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 5550 2006-09-28 18:31:47Z edwin $
+   $Id: parse.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -1612,7 +1612,7 @@ invoke_method:
 
                for(mapptr = local_map, i = 0; i < (cd->maxlocals * 5); i++, mapptr++)
                        if (*mapptr != UNUSED)
-                               jd->var[*mapptr].type = i%5;
+                               VAR(*mapptr)->type = i%5;
        }
 
        /* everything's ok */

diff --git a/src/vm/jit/powerpc/darwin/md-abi.c b/src/vm/jit/powerpc/darwin/md-abi.c
index 2f069ab9996bf44fd51881432037482b1f0d8efe..477100570f8d56d96c4ea3a2dd5826f049134168 100644 (file)
--- a/src/vm/jit/powerpc/darwin/md-abi.c
+++ b/src/vm/jit/powerpc/darwin/md-abi.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Ullrich
 
-   $Id: md-abi.c 5522 2006-09-15 17:05:58Z christian $
+   $Id: md-abi.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -251,7 +251,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
 /*                     stackslot->varkind = ARGVAR; */
 /*                     stackslot->varnum  = -1; */
 /*                     stackslot->flags   = 0; */
-                       jd->var[stackslot->varnum].flags = PREALLOC;
+                       VAR(stackslot->varnum)->flags = PREALLOC;
 
                        if (IS_INT_LNG_TYPE(md->returntype.type)) {
                                if (!IS_2_WORD_TYPE(md->returntype.type)) {
@@ -259,14 +259,14 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
                                                rd->argintreguse = 1;
 
 /*                                     stackslot->regoff = REG_RESULT; */
-                                       jd->var[stackslot->varnum].vv.regoff = REG_RESULT;
+                                       VAR(stackslot->varnum)->vv.regoff = REG_RESULT;
                                }
                                else {
                                        if (rd->argintreguse < 2)
                                                rd->argintreguse = 2;
 
 /*                                     stackslot->regoff = REG_RESULT_PACKED; */
-                                       jd->var[stackslot->varnum].vv.regoff = REG_RESULT_PACKED;
+                                       VAR(stackslot->varnum)->vv.regoff = REG_RESULT_PACKED;
                                }
                        }
                        else {
@@ -274,7 +274,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
                                        rd->argfltreguse = 1;
 
 /*                             stackslot->regoff = REG_FRESULT; */
-                               jd->var[stackslot->varnum].vv.regoff = REG_FRESULT;
+                               VAR(stackslot->varnum)->vv.regoff = REG_FRESULT;
                        }
                }
        }

diff --git a/src/vm/jit/powerpc/linux/md-abi.c b/src/vm/jit/powerpc/linux/md-abi.c
index 33c5ce3f5fa141d088b5c7e3e9507d01b32ccb3a..a126ccb7cc93c95859659258135ad90dcb37d3bf 100644 (file)
--- a/src/vm/jit/powerpc/linux/md-abi.c
+++ b/src/vm/jit/powerpc/linux/md-abi.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Ullrich
 
-   $Id: md-abi.c 5522 2006-09-15 17:05:58Z christian $
+   $Id: md-abi.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -245,7 +245,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
 /*                     stackslot->varkind = ARGVAR; */
 /*                     stackslot->varnum  = -1; */
 /*                     stackslot->flags   = 0; */
-                       jd->var[stackslot->varnum].flags = PREALLOC;
+                       VAR(stackslot->varnum)->flags = PREALLOC;
 
                        if (IS_INT_LNG_TYPE(md->returntype.type)) {
                                if (!IS_2_WORD_TYPE(md->returntype.type)) {
@@ -253,14 +253,14 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
                                                rd->argintreguse = 1;
 
 /*                                     stackslot->regoff = REG_RESULT; */
-                                       jd->var[stackslot->varnum].vv.regoff = REG_RESULT;
+                                       VAR(stackslot->varnum)->vv.regoff = REG_RESULT;
                                }
                                else {
                                        if (rd->argintreguse < 2)
                                                rd->argintreguse = 2;
 
 /*                                     stackslot->regoff = REG_RESULT_PACKED; */
-                                       jd->var[stackslot->varnum].vv.regoff = REG_RESULT_PACKED;
+                                       VAR(stackslot->varnum)->vv.regoff = REG_RESULT_PACKED;
                                }
                        }
                        else { /* float/double */
@@ -268,7 +268,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
                                        rd->argfltreguse = 1;
 
 /*                             stackslot->regoff = REG_FRESULT; */
-                               jd->var[stackslot->varnum].vv.regoff = REG_FRESULT;
+                               VAR(stackslot->varnum)->vv.regoff = REG_FRESULT;
                        }
                }
        }

diff --git a/src/vm/jit/show.c b/src/vm/jit/show.c
index 6a168c46b8ea8ac8c5c36fcc593b5268cfa1b888..14c069addcd3391500cb59e5b0bbfd98b09ae15d 100644 (file)
--- a/src/vm/jit/show.c
+++ b/src/vm/jit/show.c
@@ -207,9 +207,9 @@ void new_show_method(jitdata *jd, int stage)
 # if defined(ENABLE_INTRP)
                        if (!opt_intrp) {
 # endif
-                               printf("   (%s) ", show_jit_type_names[jd->var[i].type]);
+                               printf("   (%s) ", show_jit_type_names[VAR(i)->type]);
                                if (stage >= SHOW_REGS)
-                                       show_allocation(jd->var[i].type, jd->var[i].flags, jd->var[i].vv.regoff);
+                                       show_allocation(VAR(i)->type, VAR(i)->flags, VAR(i)->vv.regoff);
                                printf("\n");
 # if defined(ENABLE_INTRP)
                        }
@@ -313,7 +313,7 @@ void new_show_method(jitdata *jd, int stage)
                        printf("    M%02d = 0x%02x(sp): ", i, i * 8);
 #endif
                        for (j=0; j<jd->varcount; ++j) {
-                               varinfo *v = jd->var + j;
+                               varinfo *v = VAR(j);
                                if ((v->flags & INMEMORY) && (v->vv.regoff == i)) {
                                        show_variable(jd, j, stage);
                                        putchar(' ');
@@ -686,7 +686,7 @@ static void show_variable(jitdata *jd, s4 index, int stage)
        char kind;
        varinfo *v;
 
-       v = &(jd->var[index]);
+       v = VAR(index);
 
        switch (v->type) {
                case TYPE_INT: type = 'i'; break;

diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c
index 1e20d0e8db36b5830fcb527cf7e4f34c1bc3fdbf..bbb9075679512a36a5f0873cfb2b51817b83783a 100644 (file)
--- a/src/vm/jit/verify/typecheck.c
+++ b/src/vm/jit/verify/typecheck.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: typecheck.c 5515 2006-09-15 14:43:22Z edwin $
+   $Id: typecheck.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -235,7 +235,7 @@ static void typecheck_print_var(FILE *file, jitdata *jd, s4 index)
        varinfo *var;
 
        assert(index >= 0 && index < jd->varcount);
-       var = jd->var + index;
+       var = VAR(index);
        typeinfo_print_type(file, var->type, &(var->typeinfo));
 }
 
@@ -1444,10 +1444,10 @@ verify_basic_block(verifier_state *state)
                                TYPECHECK_COUNT(stat_ins_aload);
 
                                /* loading a returnAddress is not allowed */
-                               if (!TYPEDESC_IS_REFERENCE(jd->var[state->iptr->s1.varindex])) {
+                               if (!TYPEDESC_IS_REFERENCE(*VAROP(state->iptr->s1))) {
                                        TYPECHECK_VERIFYERROR_bool("illegal instruction: ALOAD loading non-reference");
                                }
-                               TYPEINFO_COPY(jd->var[state->iptr->s1.varindex].typeinfo,dv->typeinfo);
+                               TYPEINFO_COPY(VAROP(state->iptr->s1)->typeinfo,dv->typeinfo);
                                dv->type = TYPE_ADR;
                                break;
 

diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c
index 3da3759acd832b32dec03189868d254611dc7512..e68a0531bf0c70b5781a25622b53db994eb21fd1 100644 (file)
--- a/src/vm/jit/x86_64/codegen.c
+++ b/src/vm/jit/x86_64/codegen.c
@@ -30,7 +30,7 @@
    Changes: Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 5587 2006-09-30 10:16:48Z christian $
+   $Id: codegen.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -2789,7 +2789,7 @@ gen_method:
 
                        for (s3 = s3 - 1; s3 >= 0; s3--) {
                                s1 = iptr->sx.s23.s2.args[s3];
-                               var1 = jd->var + s1;
+                               var1 = VAR(s1);
 
                                /* Already Preallocated (ARGVAR) ? */
                                if (var1->flags & PREALLOC)
@@ -3365,7 +3365,7 @@ gen_method:
 
                                /* copy SAVEDVAR sizes to stack */
                                s3 = iptr->sx.s23.s2.args[s1];
-                               var1 = jd->var + s3;
+                               var1 = VAR(s3);
 
                                /* Already Preallocated (ARGVAR) ? */
                                if (!(var1->flags & PREALLOC)) {

diff --git a/src/vm/jit/x86_64/codegen.h b/src/vm/jit/x86_64/codegen.h
index ff996a32b863d1da74d6d682eca6a1abb4660aaf..320f76a7c9c57fd1e7560f48712b5c0a59e3aa0c 100644 (file)
--- a/src/vm/jit/x86_64/codegen.h
+++ b/src/vm/jit/x86_64/codegen.h
@@ -29,7 +29,7 @@
 
    Changes:
 
-   $Id: codegen.h 5507 2006-09-15 09:19:11Z christian $
+   $Id: codegen.h 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -124,7 +124,7 @@
     } while (0)
 
 
-#define M_COPY(s,d)    emit_copy(jd, iptr, &(jd->var[(s)]), &(jd->var[(d)]))
+#define M_COPY(s,d)    emit_copy(jd, iptr, VAR(s), VAR(d))
 
 #define ICONST(r,c) \
     do { \

diff --git a/src/vm/jit/x86_64/emit.c b/src/vm/jit/x86_64/emit.c
index 8ced7a8290747c1a9aeda0a4ee13e2ef73b20667..f9f0fa82aadbc67d4c23d958c84224edd3f4bbd7 100644 (file)
--- a/src/vm/jit/x86_64/emit.c
+++ b/src/vm/jit/x86_64/emit.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: emit.c 5561 2006-09-28 19:53:05Z edwin $
+   $Id: emit.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -669,9 +669,9 @@ void emit_ishift(jitdata *jd, s4 shift_op, instruction *iptr)
 
        cd = jd->cd;
 
-       v_s1  = jd->var + iptr->s1.varindex;
-       v_s2  = jd->var + iptr->sx.s23.s2.varindex;
-       v_dst = jd->var + iptr->dst.varindex;
+       v_s1  = VAROP(iptr->s1);
+       v_s2  = VAROP(iptr->sx.s23.s2);
+       v_dst = VAROP(iptr->dst);
 
        s1 = v_s1->vv.regoff;
        s2 = v_s2->vv.regoff;
@@ -796,9 +796,9 @@ void emit_lshift(jitdata *jd, s4 shift_op, instruction *iptr)
 
        cd = jd->cd;
 
-       v_s1  = jd->var + iptr->s1.varindex;
-       v_s2  = jd->var + iptr->sx.s23.s2.varindex;
-       v_dst = jd->var + iptr->dst.varindex;
+       v_s1  = VAROP(iptr->s1);
+       v_s2  = VAROP(iptr->sx.s23.s2);
+       v_dst = VAROP(iptr->dst);
 
        s1 = v_s1->vv.regoff;
        s2 = v_s2->vv.regoff;

diff --git a/src/vm/jit/x86_64/md-abi.c b/src/vm/jit/x86_64/md-abi.c
index e82f9a44567d62eaaf2782cf540b9c46bc8e82f1..47b9a965740f49d5b61fbd5d51af957e0a0abd78 100644 (file)
--- a/src/vm/jit/x86_64/md-abi.c
+++ b/src/vm/jit/x86_64/md-abi.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: md-abi.c 5507 2006-09-15 09:19:11Z christian $
+   $Id: md-abi.c 5595 2006-09-30 23:06:36Z edwin $
 
 */
 
@@ -194,8 +194,8 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
                                        rd->argfltreguse = 1;
 
 /*                             stackslot->regoff = REG_FRESULT; */
-                               jd->var[stackslot->varnum].flags = PREALLOC;
-                               jd->var[stackslot->varnum].vv.regoff = REG_FRESULT;
+                               VAR(stackslot->varnum)->flags = PREALLOC;
+                               VAR(stackslot->varnum)->vv.regoff = REG_FRESULT;
                        }
                }
        }