bug fixes: DUP2_X1 and DUP* regalloc

diff --git a/jit/alpha/codegen.c b/jit/alpha/codegen.c
index 915a8c26f09ebdb137ae23e2ff17fe82760c9459..9cb6916034e0d241d0f0c4c710464921184d0497 100644 (file)
--- a/jit/alpha/codegen.c
+++ b/jit/alpha/codegen.c
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: codegen.c 1298 2004-07-10 17:06:21Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -111,122 +111,6 @@ int nregdescfloat[] = {
 /* for use of reserved registers, see comment above */
 
 
-/* parameter allocation mode */
-
-int nreg_parammode = PARAMMODE_NUMBERED;  
-
-   /* parameter-registers will be allocated by assigning the
-      1. parameter:   int/float-reg 16
-      2. parameter:   int/float-reg 17  
-      3. parameter:   int/float-reg 18 ....
-   */
-
-
-/* stackframe-infos ***********************************************************/
-
-int parentargs_base; /* offset in stackframe for the parameter from the caller*/
-
-/* -> see file 'calling.doc' */
-
-
-/* additional functions and macros to generate code ***************************/
-
-/* #define BlockPtrOfPC(pc)        block+block_index[pc] */
-#define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
-
-
-#ifdef STATISTICS
-#define COUNT_SPILLS count_spills++
-#else
-#define COUNT_SPILLS
-#endif
-
-
-/* gen_nullptr_check(objreg) */
-
-#define gen_nullptr_check(objreg) \
-    if (checknull) { \
-        M_BEQZ((objreg), 0); \
-        codegen_addxnullrefs(mcodeptr); \
-    }
-
-
-/* MCODECHECK(icnt) */
-
-#define MCODECHECK(icnt) \
-       if((mcodeptr + (icnt)) > mcodeend) mcodeptr = codegen_increase((u1*) mcodeptr)
-
-/* M_INTMOVE:
-     generates an integer-move from register a to b.
-     if a and b are the same int-register, no code will be generated.
-*/ 
-
-#define M_INTMOVE(a,b) if (a != b) { M_MOV(a, b); }
-
-
-/* M_FLTMOVE:
-    generates a floating-point-move from register a to b.
-    if a and b are the same float-register, no code will be generated
-*/ 
-
-#define M_FLTMOVE(a,b) if (a != b) { M_FMOV(a, b); }
-
-
-/* var_to_reg_xxx:
-    this function generates code to fetch data from a pseudo-register
-    into a real register. 
-    If the pseudo-register has actually been assigned to a real 
-    register, no code will be emitted, since following operations
-    can use this register directly.
-    
-    v: pseudoregister to be fetched from
-    tempregnum: temporary register to be used if v is actually spilled to ram
-
-    return: the register number, where the operand can be found after 
-            fetching (this wil be either tempregnum or the register
-            number allready given to v)
-*/
-
-#define var_to_reg_int(regnr,v,tempnr) { \
-       if ((v)->flags & INMEMORY) \
-               {COUNT_SPILLS;M_LLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
-       else regnr=(v)->regoff; \
-}
-
-
-#define var_to_reg_flt(regnr,v,tempnr) { \
-       if ((v)->flags & INMEMORY) \
-               {COUNT_SPILLS;M_DLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
-       else regnr=(v)->regoff; \
-}
-
-
-/* store_reg_to_var_xxx:
-    This function generates the code to store the result of an operation
-    back into a spilled pseudo-variable.
-    If the pseudo-variable has not been spilled in the first place, this 
-    function will generate nothing.
-    
-    v ............ Pseudovariable
-    tempregnum ... Number of the temporary registers as returned by
-                   reg_of_var.
-*/     
-
-#define store_reg_to_var_int(sptr, tempregnum) {       \
-       if ((sptr)->flags & INMEMORY) {                    \
-               COUNT_SPILLS;                                  \
-               M_LST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
-               }                                              \
-       }
-
-#define store_reg_to_var_flt(sptr, tempregnum) {       \
-       if ((sptr)->flags & INMEMORY) {                    \
-               COUNT_SPILLS;                                  \
-               M_DST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
-               }                                              \
-       }
-
-
 /* NullPointerException handlers and exception handling initialisation        */
 
 typedef struct sigctx_struct {
@@ -348,8 +232,9 @@ ieee_set_fp_control(ieee_get_fp_control()
 
 void codegen(methodinfo *m)
 {
-       s4   len, s1, s2, s3, d;
-       s4   a;
+       s4 len, s1, s2, s3, d;
+       s4 a;
+       s4 parentargs_base;
        s4             *mcodeptr;
        stackptr        src;
        varinfo        *var;
@@ -809,29 +694,24 @@ void codegen(methodinfo *m)
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
 
-#define M_COPY(from,to) \
-                       d = reg_of_var(m, to, REG_IFTMP); \
-                       if ((from->regoff != to->regoff) || \
-                           ((from->flags ^ to->flags) & INMEMORY)) { \
-                               if (IS_FLT_DBL_TYPE(from->type)) { \
-                                       var_to_reg_flt(s1, from, d); \
-                                       M_FLTMOVE(s1,d); \
-                                       store_reg_to_var_flt(to, d); \
-                                       }\
-                               else { \
-                                       var_to_reg_int(s1, from, d); \
-                                       M_INTMOVE(s1,d); \
-                                       store_reg_to_var_int(to, d); \
-                                       }\
-                               }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
                        M_COPY(src, iptr->dst);
                        break;
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -841,14 +721,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -857,13 +734,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 
@@ -3257,7 +3134,6 @@ nowperformreturn:
 
 gen_method: {
                        methodinfo *lm;
-                       classinfo  *ci;
 
                        MCODECHECK((s3 << 1) + 64);
 
@@ -3292,56 +3168,46 @@ gen_method: {
 
                        lm = iptr->val.a;
                        switch (iptr->opc) {
-                               case ICMD_BUILTIN3:
-                               case ICMD_BUILTIN2:
-                               case ICMD_BUILTIN1:
-                                       a = dseg_addaddress((void *) lm);
+                       case ICMD_BUILTIN3:
+                       case ICMD_BUILTIN2:
+                       case ICMD_BUILTIN1:
+                               a = dseg_addaddress((void *) lm);
+                               d = iptr->op1;
 
-                                       M_ALD(REG_PV, REG_PV, a); /* Pointer to built-in-function */
-                                       d = iptr->op1;
-                                       goto makeactualcall;
-
-                               case ICMD_INVOKESTATIC:
-                               case ICMD_INVOKESPECIAL:
-                                       a = dseg_addaddress(lm->stubroutine);
-
-                                       M_ALD(REG_PV, REG_PV, a);        /* method pointer in r27 */
+                               M_ALD(REG_PV, REG_PV, a);     /* Pointer to built-in-function */
+                               break;
 
-                                       d = lm->returntype;
-                                       goto makeactualcall;
+                       case ICMD_INVOKESTATIC:
+                       case ICMD_INVOKESPECIAL:
+                               a = dseg_addaddress(lm->stubroutine);
+                               d = lm->returntype;
 
-                               case ICMD_INVOKEVIRTUAL:
+                               M_ALD(REG_PV, REG_PV, a);            /* method pointer in r27 */
+                               break;
 
-                                       gen_nullptr_check(r->argintregs[0]);
-                                       M_ALD(REG_METHODPTR, r->argintregs[0],
-                                                 OFFSET(java_objectheader, vftbl));
-                                       M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl_t, table[0]) +
-                                                 sizeof(methodptr) * lm->vftblindex);
+                       case ICMD_INVOKEVIRTUAL:
+                               d = lm->returntype;
 
-                                       d = lm->returntype;
-                                       goto makeactualcall;
+                               gen_nullptr_check(r->argintregs[0]);
+                               M_ALD(REG_METHODPTR, r->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));
+                               M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl_t, table[0]) +
+                                         sizeof(methodptr) * lm->vftblindex);
+                               break;
 
-                               case ICMD_INVOKEINTERFACE:
-                                       ci = lm->class;
+                       case ICMD_INVOKEINTERFACE:
+                               d = lm->returntype;
                                        
-                                       gen_nullptr_check(r->argintregs[0]);
-                                       M_ALD(REG_METHODPTR, r->argintregs[0],
-                                                 OFFSET(java_objectheader, vftbl));    
-                                       M_ALD(REG_METHODPTR, REG_METHODPTR,
-                                             OFFSET(vftbl_t, interfacetable[0]) -
-                                             sizeof(methodptr*) * ci->index);
-                                       M_ALD(REG_PV, REG_METHODPTR,
-                                                 sizeof(methodptr) * (lm - ci->methods));
-
-                                       d = lm->returntype;
-                                       goto makeactualcall;
-
-                               default:
-                                       d = 0;
-                                       error ("Unkown ICMD-Command: %d", iptr->opc);
-                               }
-
-makeactualcall:
+                               gen_nullptr_check(r->argintregs[0]);
+                               M_ALD(REG_METHODPTR, r->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));    
+                               M_ALD(REG_METHODPTR, REG_METHODPTR,
+                                         OFFSET(vftbl_t, interfacetable[0]) -
+                                         sizeof(methodptr*) * lm->class->index);
+                               M_ALD(REG_PV, REG_METHODPTR,
+                                         sizeof(methodptr) * (lm - lm->class->methods));
+                               break;
+                       }
 
                        M_JSR(REG_RA, REG_PV);
 

diff --git a/jit/alpha/codegen.h b/jit/alpha/codegen.h
index dba7ae761bff57c0b596193a044fafd4aad03368..1ed2a4dc0886c2ad22f28db0f2050a8d6df72d27 100644 (file)
--- a/jit/alpha/codegen.h
+++ b/jit/alpha/codegen.h
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: codegen.h 1218 2004-06-29 14:11:16Z twisti $
+   $Id: codegen.h 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -80,6 +80,121 @@
 #define FLT_ARG_CNT      6   /* number of flt argument registers              */
 
 
+/* additional functions and macros to generate code ***************************/
+
+/* #define BlockPtrOfPC(pc)        block+block_index[pc] */
+#define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
+
+
+#ifdef STATISTICS
+#define COUNT_SPILLS count_spills++
+#else
+#define COUNT_SPILLS
+#endif
+
+
+/* gen_nullptr_check(objreg) */
+
+#define gen_nullptr_check(objreg) \
+    if (checknull) { \
+        M_BEQZ((objreg), 0); \
+        codegen_addxnullrefs(mcodeptr); \
+    }
+
+
+/* MCODECHECK(icnt) */
+
+#define MCODECHECK(icnt) \
+       if((mcodeptr + (icnt)) > mcodeend) mcodeptr = codegen_increase((u1*) mcodeptr)
+
+/* M_INTMOVE:
+     generates an integer-move from register a to b.
+     if a and b are the same int-register, no code will be generated.
+*/ 
+
+#define M_INTMOVE(a,b) if (a != b) { M_MOV(a, b); }
+
+
+/* M_FLTMOVE:
+    generates a floating-point-move from register a to b.
+    if a and b are the same float-register, no code will be generated
+*/ 
+
+#define M_FLTMOVE(a,b) if (a != b) { M_FMOV(a, b); }
+
+
+/* var_to_reg_xxx:
+    this function generates code to fetch data from a pseudo-register
+    into a real register. 
+    If the pseudo-register has actually been assigned to a real 
+    register, no code will be emitted, since following operations
+    can use this register directly.
+    
+    v: pseudoregister to be fetched from
+    tempregnum: temporary register to be used if v is actually spilled to ram
+
+    return: the register number, where the operand can be found after 
+            fetching (this wil be either tempregnum or the register
+            number allready given to v)
+*/
+
+#define var_to_reg_int(regnr,v,tempnr) { \
+       if ((v)->flags & INMEMORY) \
+               {COUNT_SPILLS;M_LLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
+       else regnr=(v)->regoff; \
+}
+
+
+#define var_to_reg_flt(regnr,v,tempnr) { \
+       if ((v)->flags & INMEMORY) \
+               {COUNT_SPILLS;M_DLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
+       else regnr=(v)->regoff; \
+}
+
+
+/* store_reg_to_var_xxx:
+    This function generates the code to store the result of an operation
+    back into a spilled pseudo-variable.
+    If the pseudo-variable has not been spilled in the first place, this 
+    function will generate nothing.
+    
+    v ............ Pseudovariable
+    tempregnum ... Number of the temporary registers as returned by
+                   reg_of_var.
+*/     
+
+#define store_reg_to_var_int(sptr, tempregnum) {       \
+       if ((sptr)->flags & INMEMORY) {                    \
+               COUNT_SPILLS;                                  \
+               M_LST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
+               }                                              \
+       }
+
+#define store_reg_to_var_flt(sptr, tempregnum) {       \
+       if ((sptr)->flags & INMEMORY) {                    \
+               COUNT_SPILLS;                                  \
+               M_DST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
+               }                                              \
+       }
+
+
+#define M_COPY(from,to) \
+       d = reg_of_var(m, to, REG_IFTMP); \
+       if ((from->regoff != to->regoff) || \
+           ((from->flags ^ to->flags) & INMEMORY)) { \
+               if (IS_FLT_DBL_TYPE(from->type)) { \
+                       var_to_reg_flt(s1, from, d); \
+                       M_FLTMOVE(s1,d); \
+                       store_reg_to_var_flt(to, d); \
+                       }\
+               else { \
+                       var_to_reg_int(s1, from, d); \
+                       M_INTMOVE(s1,d); \
+                       store_reg_to_var_int(to, d); \
+                       }\
+               }
+
+
 /* macros to create code ******************************************************/
 
 #define REG   0

diff --git a/jit/mips/codegen.c b/jit/mips/codegen.c
index 3c74badd7e276a3d91b355fb268ae5496dc04d3b..18738ea6c67087f88734bfb6274be781924d7759 100644 (file)
--- a/jit/mips/codegen.c
+++ b/jit/mips/codegen.c
@@ -32,7 +32,7 @@
    This module generates MIPS machine code for a sequence of
    intermediate code commands (ICMDs).
 
-   $Id: codegen.c 1301 2004-07-11 11:21:21Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -686,29 +686,24 @@ void codegen(methodinfo *m)
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
 
-#define M_COPY(from,to) \
-                       d = reg_of_var(m, to, REG_IFTMP); \
-                       if ((from->regoff != to->regoff) || \
-                           ((from->flags ^ to->flags) & INMEMORY)) { \
-                               if (IS_FLT_DBL_TYPE(from->type)) { \
-                                       var_to_reg_flt(s1, from, d); \
-                                       M_TFLTMOVE(from->type,s1,d); \
-                                       store_reg_to_var_flt(to, d); \
-                                       }\
-                               else { \
-                                       var_to_reg_int(s1, from, d); \
-                                       M_INTMOVE(s1,d); \
-                                       store_reg_to_var_int(to, d); \
-                                       }\
-                               }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
                        M_COPY(src, iptr->dst);
                        break;
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -718,14 +713,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -734,13 +726,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 

diff --git a/jit/mips/codegen.h b/jit/mips/codegen.h
index 3e7c6c3433963da04c80fa215d7f836926ebbc4f..77eafda0fac39b55b43c6fc008e7d8c7bb5fb9c1 100644 (file)
--- a/jit/mips/codegen.h
+++ b/jit/mips/codegen.h
@@ -27,7 +27,7 @@
 
    Authors: Andreas Krall
 
-   $Id: codegen.h 1291 2004-07-09 13:20:56Z twisti $
+   $Id: codegen.h 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -235,6 +235,22 @@
        }
 
 
+#define M_COPY(from,to) \
+       d = reg_of_var(m, to, REG_IFTMP); \
+       if ((from->regoff != to->regoff) || \
+           ((from->flags ^ to->flags) & INMEMORY)) { \
+               if (IS_FLT_DBL_TYPE(from->type)) { \
+                       var_to_reg_flt(s1, from, d); \
+                       M_TFLTMOVE(from->type, s1, d); \
+                       store_reg_to_var_flt(to, d); \
+               } else { \
+                       var_to_reg_int(s1, from, d); \
+                       M_INTMOVE(s1, d); \
+                       store_reg_to_var_int(to, d); \
+               } \
+       }
+
+
 /* macros to create code ******************************************************/
 
 /* code generation macros operands:

diff --git a/jit/powerpc/codegen.c b/jit/powerpc/codegen.c
index 9ddf57b91d8fe90ac9ec7d6396cca6da2c2be4a0..382cc32b6d2ae248ae2b97b0ee0b582d2d644eb8 100644 (file)
--- a/jit/powerpc/codegen.c
+++ b/jit/powerpc/codegen.c
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Stefan Ring
 
-   $Id: codegen.c 1309 2004-07-12 23:21:33Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -83,13 +83,6 @@ int nregdescfloat[] = {
 /* for use of reserved registers, see comment above */
 
 
-/* stackframe-infos ***********************************************************/
-
-int parentargs_base; /* offset in stackframe for the parameter from the caller*/
-
-/* -> see file 'calling.doc' */
-
-
 /* additional functions and macros to generate code ***************************/
 
 #define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
@@ -972,7 +965,18 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -982,14 +986,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -998,13 +999,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 

diff --git a/jit/x86_64/codegen.c b/jit/x86_64/codegen.c
index 5555313727b23179f7874193166b6a71f3aef614..12375672048a9950e3788915b3e02f6a38f121bc 100644 (file)
--- a/jit/x86_64/codegen.c
+++ b/jit/x86_64/codegen.c
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.c 1304 2004-07-11 14:31:53Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -213,6 +213,7 @@ void codegen(methodinfo *m)
 {
        s4 len, s1, s2, s3, d;
        s8 a;
+       s4 parentargs_base;
        stackptr        src;
        varinfo        *var;
        basicblock     *bptr;
@@ -722,28 +723,24 @@ void codegen(methodinfo *m)
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
 
-#define M_COPY(from,to) \
-               d = reg_of_var(m, to, REG_ITMP1); \
-                       if ((from->regoff != to->regoff) || \
-                           ((from->flags ^ to->flags) & INMEMORY)) { \
-                               if (IS_FLT_DBL_TYPE(from->type)) { \
-                                       var_to_reg_flt(s1, from, d); \
-                                       M_FLTMOVE(s1, d); \
-                                       store_reg_to_var_flt(to, d); \
-                               } else { \
-                                       var_to_reg_int(s1, from, d); \
-                                       M_INTMOVE(s1, d); \
-                                       store_reg_to_var_int(to, d); \
-                               } \
-                       }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
                        M_COPY(src, iptr->dst);
                        break;
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -753,14 +750,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -769,13 +763,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 

diff --git a/jit/x86_64/codegen.h b/jit/x86_64/codegen.h
index d5111bbc6fb923d1ccb07fcc39dbaa552fc4ec33..a73319c7853a589dcfe959cdbe5b270e8abd5d00 100644 (file)
--- a/jit/x86_64/codegen.h
+++ b/jit/x86_64/codegen.h
@@ -27,7 +27,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.h 1284 2004-07-07 15:56:17Z twisti $
+   $Id: codegen.h 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -454,6 +454,22 @@ typedef enum {
     }
 
 
+#define M_COPY(from,to) \
+    d = reg_of_var(m, to, REG_ITMP1); \
+       if ((from->regoff != to->regoff) || \
+           ((from->flags ^ to->flags) & INMEMORY)) { \
+               if (IS_FLT_DBL_TYPE(from->type)) { \
+                       var_to_reg_flt(s1, from, d); \
+                       M_FLTMOVE(s1, d); \
+                       store_reg_to_var_flt(to, d); \
+               } else { \
+                       var_to_reg_int(s1, from, d); \
+                       M_INTMOVE(s1, d); \
+                       store_reg_to_var_int(to, d); \
+               } \
+       }
+
+
 /* function gen_resolvebranch **************************************************
 
     backpatches a branch instruction

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index 915a8c26f09ebdb137ae23e2ff17fe82760c9459..9cb6916034e0d241d0f0c4c710464921184d0497 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: codegen.c 1298 2004-07-10 17:06:21Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -111,122 +111,6 @@ int nregdescfloat[] = {
 /* for use of reserved registers, see comment above */
 
 
-/* parameter allocation mode */
-
-int nreg_parammode = PARAMMODE_NUMBERED;  
-
-   /* parameter-registers will be allocated by assigning the
-      1. parameter:   int/float-reg 16
-      2. parameter:   int/float-reg 17  
-      3. parameter:   int/float-reg 18 ....
-   */
-
-
-/* stackframe-infos ***********************************************************/
-
-int parentargs_base; /* offset in stackframe for the parameter from the caller*/
-
-/* -> see file 'calling.doc' */
-
-
-/* additional functions and macros to generate code ***************************/
-
-/* #define BlockPtrOfPC(pc)        block+block_index[pc] */
-#define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
-
-
-#ifdef STATISTICS
-#define COUNT_SPILLS count_spills++
-#else
-#define COUNT_SPILLS
-#endif
-
-
-/* gen_nullptr_check(objreg) */
-
-#define gen_nullptr_check(objreg) \
-    if (checknull) { \
-        M_BEQZ((objreg), 0); \
-        codegen_addxnullrefs(mcodeptr); \
-    }
-
-
-/* MCODECHECK(icnt) */
-
-#define MCODECHECK(icnt) \
-       if((mcodeptr + (icnt)) > mcodeend) mcodeptr = codegen_increase((u1*) mcodeptr)
-
-/* M_INTMOVE:
-     generates an integer-move from register a to b.
-     if a and b are the same int-register, no code will be generated.
-*/ 
-
-#define M_INTMOVE(a,b) if (a != b) { M_MOV(a, b); }
-
-
-/* M_FLTMOVE:
-    generates a floating-point-move from register a to b.
-    if a and b are the same float-register, no code will be generated
-*/ 
-
-#define M_FLTMOVE(a,b) if (a != b) { M_FMOV(a, b); }
-
-
-/* var_to_reg_xxx:
-    this function generates code to fetch data from a pseudo-register
-    into a real register. 
-    If the pseudo-register has actually been assigned to a real 
-    register, no code will be emitted, since following operations
-    can use this register directly.
-    
-    v: pseudoregister to be fetched from
-    tempregnum: temporary register to be used if v is actually spilled to ram
-
-    return: the register number, where the operand can be found after 
-            fetching (this wil be either tempregnum or the register
-            number allready given to v)
-*/
-
-#define var_to_reg_int(regnr,v,tempnr) { \
-       if ((v)->flags & INMEMORY) \
-               {COUNT_SPILLS;M_LLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
-       else regnr=(v)->regoff; \
-}
-
-
-#define var_to_reg_flt(regnr,v,tempnr) { \
-       if ((v)->flags & INMEMORY) \
-               {COUNT_SPILLS;M_DLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
-       else regnr=(v)->regoff; \
-}
-
-
-/* store_reg_to_var_xxx:
-    This function generates the code to store the result of an operation
-    back into a spilled pseudo-variable.
-    If the pseudo-variable has not been spilled in the first place, this 
-    function will generate nothing.
-    
-    v ............ Pseudovariable
-    tempregnum ... Number of the temporary registers as returned by
-                   reg_of_var.
-*/     
-
-#define store_reg_to_var_int(sptr, tempregnum) {       \
-       if ((sptr)->flags & INMEMORY) {                    \
-               COUNT_SPILLS;                                  \
-               M_LST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
-               }                                              \
-       }
-
-#define store_reg_to_var_flt(sptr, tempregnum) {       \
-       if ((sptr)->flags & INMEMORY) {                    \
-               COUNT_SPILLS;                                  \
-               M_DST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
-               }                                              \
-       }
-
-
 /* NullPointerException handlers and exception handling initialisation        */
 
 typedef struct sigctx_struct {
@@ -348,8 +232,9 @@ ieee_set_fp_control(ieee_get_fp_control()
 
 void codegen(methodinfo *m)
 {
-       s4   len, s1, s2, s3, d;
-       s4   a;
+       s4 len, s1, s2, s3, d;
+       s4 a;
+       s4 parentargs_base;
        s4             *mcodeptr;
        stackptr        src;
        varinfo        *var;
@@ -809,29 +694,24 @@ void codegen(methodinfo *m)
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
 
-#define M_COPY(from,to) \
-                       d = reg_of_var(m, to, REG_IFTMP); \
-                       if ((from->regoff != to->regoff) || \
-                           ((from->flags ^ to->flags) & INMEMORY)) { \
-                               if (IS_FLT_DBL_TYPE(from->type)) { \
-                                       var_to_reg_flt(s1, from, d); \
-                                       M_FLTMOVE(s1,d); \
-                                       store_reg_to_var_flt(to, d); \
-                                       }\
-                               else { \
-                                       var_to_reg_int(s1, from, d); \
-                                       M_INTMOVE(s1,d); \
-                                       store_reg_to_var_int(to, d); \
-                                       }\
-                               }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
                        M_COPY(src, iptr->dst);
                        break;
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -841,14 +721,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -857,13 +734,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 
@@ -3257,7 +3134,6 @@ nowperformreturn:
 
 gen_method: {
                        methodinfo *lm;
-                       classinfo  *ci;
 
                        MCODECHECK((s3 << 1) + 64);
 
@@ -3292,56 +3168,46 @@ gen_method: {
 
                        lm = iptr->val.a;
                        switch (iptr->opc) {
-                               case ICMD_BUILTIN3:
-                               case ICMD_BUILTIN2:
-                               case ICMD_BUILTIN1:
-                                       a = dseg_addaddress((void *) lm);
+                       case ICMD_BUILTIN3:
+                       case ICMD_BUILTIN2:
+                       case ICMD_BUILTIN1:
+                               a = dseg_addaddress((void *) lm);
+                               d = iptr->op1;
 
-                                       M_ALD(REG_PV, REG_PV, a); /* Pointer to built-in-function */
-                                       d = iptr->op1;
-                                       goto makeactualcall;
-
-                               case ICMD_INVOKESTATIC:
-                               case ICMD_INVOKESPECIAL:
-                                       a = dseg_addaddress(lm->stubroutine);
-
-                                       M_ALD(REG_PV, REG_PV, a);        /* method pointer in r27 */
+                               M_ALD(REG_PV, REG_PV, a);     /* Pointer to built-in-function */
+                               break;
 
-                                       d = lm->returntype;
-                                       goto makeactualcall;
+                       case ICMD_INVOKESTATIC:
+                       case ICMD_INVOKESPECIAL:
+                               a = dseg_addaddress(lm->stubroutine);
+                               d = lm->returntype;
 
-                               case ICMD_INVOKEVIRTUAL:
+                               M_ALD(REG_PV, REG_PV, a);            /* method pointer in r27 */
+                               break;
 
-                                       gen_nullptr_check(r->argintregs[0]);
-                                       M_ALD(REG_METHODPTR, r->argintregs[0],
-                                                 OFFSET(java_objectheader, vftbl));
-                                       M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl_t, table[0]) +
-                                                 sizeof(methodptr) * lm->vftblindex);
+                       case ICMD_INVOKEVIRTUAL:
+                               d = lm->returntype;
 
-                                       d = lm->returntype;
-                                       goto makeactualcall;
+                               gen_nullptr_check(r->argintregs[0]);
+                               M_ALD(REG_METHODPTR, r->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));
+                               M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl_t, table[0]) +
+                                         sizeof(methodptr) * lm->vftblindex);
+                               break;
 
-                               case ICMD_INVOKEINTERFACE:
-                                       ci = lm->class;
+                       case ICMD_INVOKEINTERFACE:
+                               d = lm->returntype;
                                        
-                                       gen_nullptr_check(r->argintregs[0]);
-                                       M_ALD(REG_METHODPTR, r->argintregs[0],
-                                                 OFFSET(java_objectheader, vftbl));    
-                                       M_ALD(REG_METHODPTR, REG_METHODPTR,
-                                             OFFSET(vftbl_t, interfacetable[0]) -
-                                             sizeof(methodptr*) * ci->index);
-                                       M_ALD(REG_PV, REG_METHODPTR,
-                                                 sizeof(methodptr) * (lm - ci->methods));
-
-                                       d = lm->returntype;
-                                       goto makeactualcall;
-
-                               default:
-                                       d = 0;
-                                       error ("Unkown ICMD-Command: %d", iptr->opc);
-                               }
-
-makeactualcall:
+                               gen_nullptr_check(r->argintregs[0]);
+                               M_ALD(REG_METHODPTR, r->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));    
+                               M_ALD(REG_METHODPTR, REG_METHODPTR,
+                                         OFFSET(vftbl_t, interfacetable[0]) -
+                                         sizeof(methodptr*) * lm->class->index);
+                               M_ALD(REG_PV, REG_METHODPTR,
+                                         sizeof(methodptr) * (lm - lm->class->methods));
+                               break;
+                       }
 
                        M_JSR(REG_RA, REG_PV);
 

diff --git a/src/vm/jit/alpha/codegen.h b/src/vm/jit/alpha/codegen.h
index dba7ae761bff57c0b596193a044fafd4aad03368..1ed2a4dc0886c2ad22f28db0f2050a8d6df72d27 100644 (file)
--- a/src/vm/jit/alpha/codegen.h
+++ b/src/vm/jit/alpha/codegen.h
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: codegen.h 1218 2004-06-29 14:11:16Z twisti $
+   $Id: codegen.h 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -80,6 +80,121 @@
 #define FLT_ARG_CNT      6   /* number of flt argument registers              */
 
 
+/* additional functions and macros to generate code ***************************/
+
+/* #define BlockPtrOfPC(pc)        block+block_index[pc] */
+#define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
+
+
+#ifdef STATISTICS
+#define COUNT_SPILLS count_spills++
+#else
+#define COUNT_SPILLS
+#endif
+
+
+/* gen_nullptr_check(objreg) */
+
+#define gen_nullptr_check(objreg) \
+    if (checknull) { \
+        M_BEQZ((objreg), 0); \
+        codegen_addxnullrefs(mcodeptr); \
+    }
+
+
+/* MCODECHECK(icnt) */
+
+#define MCODECHECK(icnt) \
+       if((mcodeptr + (icnt)) > mcodeend) mcodeptr = codegen_increase((u1*) mcodeptr)
+
+/* M_INTMOVE:
+     generates an integer-move from register a to b.
+     if a and b are the same int-register, no code will be generated.
+*/ 
+
+#define M_INTMOVE(a,b) if (a != b) { M_MOV(a, b); }
+
+
+/* M_FLTMOVE:
+    generates a floating-point-move from register a to b.
+    if a and b are the same float-register, no code will be generated
+*/ 
+
+#define M_FLTMOVE(a,b) if (a != b) { M_FMOV(a, b); }
+
+
+/* var_to_reg_xxx:
+    this function generates code to fetch data from a pseudo-register
+    into a real register. 
+    If the pseudo-register has actually been assigned to a real 
+    register, no code will be emitted, since following operations
+    can use this register directly.
+    
+    v: pseudoregister to be fetched from
+    tempregnum: temporary register to be used if v is actually spilled to ram
+
+    return: the register number, where the operand can be found after 
+            fetching (this wil be either tempregnum or the register
+            number allready given to v)
+*/
+
+#define var_to_reg_int(regnr,v,tempnr) { \
+       if ((v)->flags & INMEMORY) \
+               {COUNT_SPILLS;M_LLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
+       else regnr=(v)->regoff; \
+}
+
+
+#define var_to_reg_flt(regnr,v,tempnr) { \
+       if ((v)->flags & INMEMORY) \
+               {COUNT_SPILLS;M_DLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
+       else regnr=(v)->regoff; \
+}
+
+
+/* store_reg_to_var_xxx:
+    This function generates the code to store the result of an operation
+    back into a spilled pseudo-variable.
+    If the pseudo-variable has not been spilled in the first place, this 
+    function will generate nothing.
+    
+    v ............ Pseudovariable
+    tempregnum ... Number of the temporary registers as returned by
+                   reg_of_var.
+*/     
+
+#define store_reg_to_var_int(sptr, tempregnum) {       \
+       if ((sptr)->flags & INMEMORY) {                    \
+               COUNT_SPILLS;                                  \
+               M_LST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
+               }                                              \
+       }
+
+#define store_reg_to_var_flt(sptr, tempregnum) {       \
+       if ((sptr)->flags & INMEMORY) {                    \
+               COUNT_SPILLS;                                  \
+               M_DST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
+               }                                              \
+       }
+
+
+#define M_COPY(from,to) \
+       d = reg_of_var(m, to, REG_IFTMP); \
+       if ((from->regoff != to->regoff) || \
+           ((from->flags ^ to->flags) & INMEMORY)) { \
+               if (IS_FLT_DBL_TYPE(from->type)) { \
+                       var_to_reg_flt(s1, from, d); \
+                       M_FLTMOVE(s1,d); \
+                       store_reg_to_var_flt(to, d); \
+                       }\
+               else { \
+                       var_to_reg_int(s1, from, d); \
+                       M_INTMOVE(s1,d); \
+                       store_reg_to_var_int(to, d); \
+                       }\
+               }
+
+
 /* macros to create code ******************************************************/
 
 #define REG   0

diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c
index 3c74badd7e276a3d91b355fb268ae5496dc04d3b..18738ea6c67087f88734bfb6274be781924d7759 100644 (file)
--- a/src/vm/jit/mips/codegen.c
+++ b/src/vm/jit/mips/codegen.c
@@ -32,7 +32,7 @@
    This module generates MIPS machine code for a sequence of
    intermediate code commands (ICMDs).
 
-   $Id: codegen.c 1301 2004-07-11 11:21:21Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -686,29 +686,24 @@ void codegen(methodinfo *m)
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
 
-#define M_COPY(from,to) \
-                       d = reg_of_var(m, to, REG_IFTMP); \
-                       if ((from->regoff != to->regoff) || \
-                           ((from->flags ^ to->flags) & INMEMORY)) { \
-                               if (IS_FLT_DBL_TYPE(from->type)) { \
-                                       var_to_reg_flt(s1, from, d); \
-                                       M_TFLTMOVE(from->type,s1,d); \
-                                       store_reg_to_var_flt(to, d); \
-                                       }\
-                               else { \
-                                       var_to_reg_int(s1, from, d); \
-                                       M_INTMOVE(s1,d); \
-                                       store_reg_to_var_int(to, d); \
-                                       }\
-                               }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
                        M_COPY(src, iptr->dst);
                        break;
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -718,14 +713,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -734,13 +726,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 

diff --git a/src/vm/jit/mips/codegen.h b/src/vm/jit/mips/codegen.h
index 3e7c6c3433963da04c80fa215d7f836926ebbc4f..77eafda0fac39b55b43c6fc008e7d8c7bb5fb9c1 100644 (file)
--- a/src/vm/jit/mips/codegen.h
+++ b/src/vm/jit/mips/codegen.h
@@ -27,7 +27,7 @@
 
    Authors: Andreas Krall
 
-   $Id: codegen.h 1291 2004-07-09 13:20:56Z twisti $
+   $Id: codegen.h 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -235,6 +235,22 @@
        }
 
 
+#define M_COPY(from,to) \
+       d = reg_of_var(m, to, REG_IFTMP); \
+       if ((from->regoff != to->regoff) || \
+           ((from->flags ^ to->flags) & INMEMORY)) { \
+               if (IS_FLT_DBL_TYPE(from->type)) { \
+                       var_to_reg_flt(s1, from, d); \
+                       M_TFLTMOVE(from->type, s1, d); \
+                       store_reg_to_var_flt(to, d); \
+               } else { \
+                       var_to_reg_int(s1, from, d); \
+                       M_INTMOVE(s1, d); \
+                       store_reg_to_var_int(to, d); \
+               } \
+       }
+
+
 /* macros to create code ******************************************************/
 
 /* code generation macros operands:

diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c
index 9ddf57b91d8fe90ac9ec7d6396cca6da2c2be4a0..382cc32b6d2ae248ae2b97b0ee0b582d2d644eb8 100644 (file)
--- a/src/vm/jit/powerpc/codegen.c
+++ b/src/vm/jit/powerpc/codegen.c
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Stefan Ring
 
-   $Id: codegen.c 1309 2004-07-12 23:21:33Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -83,13 +83,6 @@ int nregdescfloat[] = {
 /* for use of reserved registers, see comment above */
 
 
-/* stackframe-infos ***********************************************************/
-
-int parentargs_base; /* offset in stackframe for the parameter from the caller*/
-
-/* -> see file 'calling.doc' */
-
-
 /* additional functions and macros to generate code ***************************/
 
 #define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
@@ -972,7 +965,18 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -982,14 +986,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -998,13 +999,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 

diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c
index 5555313727b23179f7874193166b6a71f3aef614..12375672048a9950e3788915b3e02f6a38f121bc 100644 (file)
--- a/src/vm/jit/x86_64/codegen.c
+++ b/src/vm/jit/x86_64/codegen.c
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.c 1304 2004-07-11 14:31:53Z stefan $
+   $Id: codegen.c 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -213,6 +213,7 @@ void codegen(methodinfo *m)
 {
        s4 len, s1, s2, s3, d;
        s8 a;
+       s4 parentargs_base;
        stackptr        src;
        varinfo        *var;
        basicblock     *bptr;
@@ -722,28 +723,24 @@ void codegen(methodinfo *m)
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
 
-#define M_COPY(from,to) \
-               d = reg_of_var(m, to, REG_ITMP1); \
-                       if ((from->regoff != to->regoff) || \
-                           ((from->flags ^ to->flags) & INMEMORY)) { \
-                               if (IS_FLT_DBL_TYPE(from->type)) { \
-                                       var_to_reg_flt(s1, from, d); \
-                                       M_FLTMOVE(s1, d); \
-                                       store_reg_to_var_flt(to, d); \
-                               } else { \
-                                       var_to_reg_int(s1, from, d); \
-                                       M_INTMOVE(s1, d); \
-                                       store_reg_to_var_int(to, d); \
-                               } \
-                       }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
                        M_COPY(src, iptr->dst);
                        break;
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -753,14 +750,11 @@ void codegen(methodinfo *m)
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -769,13 +763,13 @@ void codegen(methodinfo *m)
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 

diff --git a/src/vm/jit/x86_64/codegen.h b/src/vm/jit/x86_64/codegen.h
index d5111bbc6fb923d1ccb07fcc39dbaa552fc4ec33..a73319c7853a589dcfe959cdbe5b270e8abd5d00 100644 (file)
--- a/src/vm/jit/x86_64/codegen.h
+++ b/src/vm/jit/x86_64/codegen.h
@@ -27,7 +27,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.h 1284 2004-07-07 15:56:17Z twisti $
+   $Id: codegen.h 1319 2004-07-16 13:45:50Z twisti $
 
 */
 
@@ -454,6 +454,22 @@ typedef enum {
     }
 
 
+#define M_COPY(from,to) \
+    d = reg_of_var(m, to, REG_ITMP1); \
+       if ((from->regoff != to->regoff) || \
+           ((from->flags ^ to->flags) & INMEMORY)) { \
+               if (IS_FLT_DBL_TYPE(from->type)) { \
+                       var_to_reg_flt(s1, from, d); \
+                       M_FLTMOVE(s1, d); \
+                       store_reg_to_var_flt(to, d); \
+               } else { \
+                       var_to_reg_int(s1, from, d); \
+                       M_INTMOVE(s1, d); \
+                       store_reg_to_var_int(to, d); \
+               } \
+       }
+
+
 /* function gen_resolvebranch **************************************************
 
     backpatches a branch instruction