fixed isleafmethod is now part of code issues

diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index ce3f32448285dc72e3acdf3183aea18d3a2a41db..8e02f97c3b82dc1f9773b0772cc1f00144dd12b0 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 5081 2006-07-06 13:59:01Z tbfg $
+   $Id: codegen.c 5082 2006-07-06 14:10:23Z tbfg $
 
 */
 
@@ -169,7 +169,7 @@ bool codegen(jitdata *jd)
 #endif
                (void) dseg_adds4(cd, 0);                          /* IsSync          */
                                               
-       (void) dseg_adds4(cd, m->isleafmethod);                /* IsLeaf          */
+       (void) dseg_adds4(cd, code->isleafmethod);                /* IsLeaf          */
        (void) dseg_adds4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave         */
        (void) dseg_adds4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave         */
 
@@ -188,7 +188,7 @@ bool codegen(jitdata *jd)
        
        /* create stack frame (if necessary) */
 
-       if (!m->isleafmethod) {
+       if (!code->isleafmethod) {
                M_MFLR(REG_ZERO);
                M_AST(REG_ZERO, REG_SP, LA_LR_OFFSET);
        }
@@ -2088,10 +2088,10 @@ bool codegen(jitdata *jd)
                        M_ALD(REG_ITMP2, REG_PV, disp);
                        M_MTCTR(REG_ITMP2);
 
-                       if (m->isleafmethod) M_MFLR(REG_ITMP3);         /* save LR        */
+                       if (code->isleafmethod) M_MFLR(REG_ITMP3);         /* save LR        */
                        M_BL(0);                                        /* get current PC */
                        M_MFLR(REG_ITMP2_XPC);
-                       if (m->isleafmethod) M_MTLR(REG_ITMP3);         /* restore LR     */
+                       if (code->isleafmethod) M_MTLR(REG_ITMP3);         /* restore LR     */
                        M_RTS;                                          /* jump to CTR    */
 
                        ALIGNCODENOP;
@@ -2107,12 +2107,12 @@ bool codegen(jitdata *jd)
                case ICMD_JSR:          /* ... ==> ...                                */
                                        /* op1 = target JavaVM pc                     */
 
-                       if (m->isleafmethod)
+                       if (code->isleafmethod)
                                M_MFLR(REG_ITMP2);
                        M_BL(0);
                        M_MFLR(REG_ITMP1);
-                       M_IADD_IMM(REG_ITMP1, m->isleafmethod ? 4*4 : 3*4, REG_ITMP1);
-                       if (m->isleafmethod)
+                       M_IADD_IMM(REG_ITMP1, code->isleafmethod ? 4*4 : 3*4, REG_ITMP1);
+                       if (code->isleafmethod)
                                M_MTLR(REG_ITMP2);
                        M_BR(0);
                        codegen_addreference(cd, (basicblock *) iptr->target);
@@ -2646,7 +2646,7 @@ nowperformreturn:
 
                        /* restore return address                                         */
 
-                       if (!m->isleafmethod) {
+                       if (!code->isleafmethod) {
                                /* ATTENTION: Don't use REG_ZERO (r0) here, as M_ALD
                                   may have a displacement overflow. */
 
@@ -3467,7 +3467,7 @@ gen_method:
                        } else {
                                savedmcodeptr = cd->mcodeptr;
 
-                               if (m->isleafmethod) {
+                               if (code->isleafmethod) {
                                        M_MFLR(REG_ZERO);
                                        M_AST(REG_ZERO, REG_SP, stackframesize * 4 + LA_LR_OFFSET);
                                }
@@ -3475,7 +3475,7 @@ gen_method:
                                M_MOV(REG_PV, rd->argintregs[0]);
                                M_MOV(REG_SP, rd->argintregs[1]);
 
-                               if (m->isleafmethod)
+                               if (code->isleafmethod)
                                        M_MOV(REG_ZERO, rd->argintregs[2]);
                                else
                                        M_ALD(rd->argintregs[2],
@@ -3494,7 +3494,7 @@ gen_method:
                                M_ALD(REG_ITMP2_XPC, REG_SP, LA_SIZE + 5 * 4);
                                M_IADD_IMM(REG_SP, LA_SIZE + 6 * 4, REG_SP);
 
-                               if (m->isleafmethod) {
+                               if (code->isleafmethod) {
                                        /* XXX FIXME: REG_ZERO can cause problems here! */
                                        assert(stackframesize * 4 <= 32767);
 

diff --git a/src/vm/jit/powerpc64/linux/md-abi.c b/src/vm/jit/powerpc64/linux/md-abi.c
index 5ebf87ed705f8d1677ecb56f80b30903c71ba666..33d7f9913ee69ad02f33805dd70bf30803bce1f9 100644 (file)
--- a/src/vm/jit/powerpc64/linux/md-abi.c
+++ b/src/vm/jit/powerpc64/linux/md-abi.c
@@ -28,7 +28,7 @@
 
    Changes: 
 
-   $Id: md-abi.c 5081 2006-07-06 13:59:01Z tbfg $
+   $Id: md-abi.c 5082 2006-07-06 14:10:23Z tbfg $
 
 */
 
@@ -218,14 +218,26 @@ void md_param_alloc(methoddesc *md)
 
 *******************************************************************************/
 
-void md_return_alloc(methodinfo *m, registerdata *rd, s4 return_type,
-                                        stackptr stackslot)
+void md_return_alloc(jitdata *jd, stackptr stackslot)
 {
+       methodinfo *m;
+       codeinfo *code;
+       registerdata *rd;
+       methoddesc *md;
+
+       /* get required compiler data */
+
+       m = jd->m;
+       code = jd->code;
+       rd = jd->rd;
+
+       md = m->parseddesc;
+       
        /* In Leafmethods Local Vars holding parameters are precolored to
           their argument register -> so leafmethods with paramcount > 0
           could already use R3 == a00! */
 
-       if (!m->isleafmethod || (m->parseddesc->paramcount == 0)) {
+       if (!code->isleafmethod || (md->paramcount == 0)) {
                /* Only precolor the stackslot, if it is not a SAVEDVAR <->
                   has not to survive method invokations. */
 
@@ -234,8 +246,8 @@ void md_return_alloc(methodinfo *m, registerdata *rd, s4 return_type,
                        stackslot->varnum = -1;
                        stackslot->flags = 0;
 
-                       if (IS_INT_LNG_TYPE(return_type)) {
-                               if (!IS_2_WORD_TYPE(return_type)) {
+                       if (IS_INT_LNG_TYPE(md->returntype.type)) {
+                               if (!IS_2_WORD_TYPE(md->returntype.type)) {
                                        if (rd->argintreguse < 1)
                                                rd->argintreguse = 1;