* src/vm/jit/mips/emit.c (emit_copy): Fixed arguments to

codegen_reg_of_var.
* src/vm/jit/powerpc64/emit.c (emit_copy): Likewise.

* src/vm/jit/mips/codegen.c (codegen): Define varindex.
* src/vm/jit/powerpc64/codegen.c (codegen): Likewise. Fixed arguments
to codegen_reg_of_var. Replaced codegen_reg_of_var with
codegen_reg_of_dst.

--HG--
branch : unified_variables

diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c
index a3a1d6d3eba0f3123222be22a5942de4ba3c71da..e95a8b49c78ae150719b765c1797c2df30f62634 100644 (file)
--- a/src/vm/jit/mips/codegen.c
+++ b/src/vm/jit/mips/codegen.c
@@ -35,7 +35,7 @@
    This module generates MIPS machine code for a sequence of
    intermediate code commands (ICMDs).
 
-   $Id: codegen.c 5615 2006-10-01 22:55:11Z edwin $
+   $Id: codegen.c 5619 2006-10-01 23:51:23Z edwin $
 
 */
 
@@ -105,6 +105,7 @@ bool codegen(jitdata *jd)
        unresolved_field   *uf;
        rplpoint           *replacementpoint;
        s4                  fieldtype;
+       s4                  varindex;
 
        /* get required compiler data */
 

diff --git a/src/vm/jit/mips/emit.c b/src/vm/jit/mips/emit.c
index 6c09e5c480f30a48e54859a20ab51ece449492f7..5a2d78dd416b81f82d86cf7a0253777931a3ddf9 100644 (file)
--- a/src/vm/jit/mips/emit.c
+++ b/src/vm/jit/mips/emit.c
@@ -151,12 +151,12 @@ void emit_copy(jitdata *jd, instruction *iptr, varinfo *src, varinfo *dst)
                   order of getting the destination register and the load. */
 
                if (IS_INMEMORY(src->flags)) {
-                       d = codegen_reg_of_var(rd, iptr->opc, dst, REG_IFTMP);
+                       d = codegen_reg_of_var(iptr->opc, dst, REG_IFTMP);
                        s1 = emit_load(jd, iptr, src, d);
                }
                else {
                        s1 = emit_load(jd, iptr, src, REG_IFTMP);
-                       d = codegen_reg_of_var(rd, iptr->opc, dst, s1);
+                       d = codegen_reg_of_var(iptr->opc, dst, s1);
                }
 
                if (s1 != d) {

diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index ce0f8d1b21eaf8523705c1a75e7709bf94aa04df..18ecc5d7c94f203d501435e4c56e186ba636ecdf 100644 (file)
--- a/src/vm/jit/powerpc64/codegen.c
+++ b/src/vm/jit/powerpc64/codegen.c
@@ -31,7 +31,7 @@
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 5618 2006-10-01 23:37:04Z edwin $
+   $Id: codegen.c 5619 2006-10-01 23:51:23Z edwin $
 
 */
 
@@ -99,6 +99,7 @@ bool codegen(jitdata *jd)
        methoddesc         *md;
        rplpoint           *replacementpoint;
        s4                  fieldtype;
+       s4                  varindex;
 
        /* get required compiler data */
 
@@ -419,7 +420,7 @@ bool codegen(jitdata *jd)
                        len--;
                        var = VAR(bptr->invars[len]);
                        if ((len == bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
-                               d = codegen_reg_of_var(rd, 0, var, REG_ITMP1);
+                               d = codegen_reg_of_var(0, var, REG_ITMP1);
                                M_INTMOVE(REG_ITMP1, d);
                                emit_store(jd, NULL, var, d);
                        } else {
@@ -1344,7 +1345,7 @@ bool codegen(jitdata *jd)
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst.var, PACK_REGS(REG_ITMP2, REG_ITMP1));
+                       d = codegen_reg_of_dst(jd, iptr, PACK_REGS(REG_ITMP2, REG_ITMP1));
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
@@ -1565,7 +1566,7 @@ bool codegen(jitdata *jd)
                                M_ILD_INTERN(d, REG_ITMP1, 0);
                                break;
                        case TYPE_LNG:
-                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst.var, PACK_REGS(REG_ITMP2, REG_ITMP1));
+                               d = codegen_reg_of_dst(jd, iptr, PACK_REGS(REG_ITMP2, REG_ITMP1));
                                M_ILD_INTERN(GET_LOW_REG(d), REG_ITMP1, 4);/* keep this order */
                                M_ILD_INTERN(GET_HIGH_REG(d), REG_ITMP1, 0);/*keep this order */
                                break;

diff --git a/src/vm/jit/powerpc64/emit.c b/src/vm/jit/powerpc64/emit.c
index a8269702e75c92c2330af540f4686e93806f7232..323e9c83d1d91238a624c27f2b145a7bbf69eb52 100644 (file)
--- a/src/vm/jit/powerpc64/emit.c
+++ b/src/vm/jit/powerpc64/emit.c
@@ -147,12 +147,12 @@ void emit_copy(jitdata *jd, instruction *iptr, varinfo *src, varinfo *dst)
                   order of getting the destination register and the load. */
 
                if (IS_INMEMORY(src->flags)) {
-                       d = codegen_reg_of_var(rd, iptr->opc, dst, REG_IFTMP);
+                       d = codegen_reg_of_var(iptr->opc, dst, REG_IFTMP);
                        s1 = emit_load(jd, iptr, src, d);
                }
                else {
                        s1 = emit_load(jd, iptr, src, REG_IFTMP);
-                       d = codegen_reg_of_var(rd, iptr->opc, dst, s1);
+                       d = codegen_reg_of_var(iptr->opc, dst, s1);
                }
 
                if (s1 != d) {