projects / cacao.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merged changes from trunk.
[cacao.git] / src / vm / jit / powerpc64 / codegen.c
diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index 662bb2e18aa549ae9a5c8e284ed883d7dcc9ff4d..18e3346143f0678f8f8dc6a7a8d3c0ddfc0588aa 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 5285 2006-09-02 14:26:04Z tbfg $
+   $Id: codegen.c 5323 2006-09-05 16:45:24Z edwin $
 
 */
 
@@ -128,15 +128,11 @@ bool codegen(jitdata *jd)
 #if defined(ENABLE_THREADS)
        /* space to save argument of monitor_enter and Return Values to survive */
     /* monitor_exit. The stack position for the argument can not be shared  */
-       /* with place to save the return register on PPC, since both values     */
+       /* with place to save the return register on PPC64, since both values     */
        /* reside in R3 */
        if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
                /* reserve 2 slots for long/double return values for monitorexit */
-
-               if (IS_2_WORD_TYPE(m->parseddesc->returntype.type))
-                       stackframesize += 3;
-               else
-                       stackframesize += 2;
+               stackframesize += 2;
        }
 
 #endif
@@ -162,7 +158,7 @@ bool codegen(jitdata *jd)
        */
 
        if (checksync && (m->flags & ACC_SYNCHRONIZED))
-               (void) dseg_adds4(cd, (rd->memuse + 1) * 4);       /* IsSync          */
+               (void) dseg_adds4(cd, (rd->memuse + 1) * 8);       /* IsSync          */
        else
 #endif
                (void) dseg_adds4(cd, 0);                          /* IsSync          */
@@ -307,6 +303,7 @@ bool codegen(jitdata *jd)
        if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
                p = dseg_addaddress(cd, LOCK_monitor_enter);
                M_ALD(REG_ITMP3, REG_PV, p);
+               M_ALD(REG_ITMP3, REG_ITMP3, 0); /* TOC */
                M_MTCTR(REG_ITMP3);
 
                /* get or test the lock object */
@@ -321,7 +318,7 @@ bool codegen(jitdata *jd)
                        codegen_add_nullpointerexception_ref(cd);
                }
 
-               M_AST(rd->argintregs[0], REG_SP, rd->memuse * 4);
+               M_AST(rd->argintregs[0], REG_SP, rd->memuse * 8);
                M_JSR;
        }
 #endif
@@ -1844,6 +1841,7 @@ bool codegen(jitdata *jd)
 
                        disp = dseg_addaddress(cd, BUILTIN_canstore);
                        M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_ALD(REG_ITMP3, REG_ITMP3, 0); /* TOC */
                        M_MTCTR(REG_ITMP3);
 
                        M_INTMOVE(s1, rd->argintregs[0]);
@@ -1944,24 +1942,24 @@ bool codegen(jitdata *jd)
                        M_ALD(REG_ITMP1, REG_PV, disp);
                        switch (iptr->op1) {
                        case TYPE_INT:
-                               s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
-                               M_IST_INTERN(s2, REG_ITMP1, 0);
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+                               M_IST_INTERN(s1, REG_ITMP1, 0);
                                break;
                        case TYPE_LNG:
-                               s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
-                               M_LST_INTERN(s2, REG_ITMP1, 0);
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+                               M_LST_INTERN(s1, REG_ITMP1, 0);
                                break;
                        case TYPE_ADR:
-                               s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
-                               M_AST_INTERN(s2, REG_ITMP1, 0);
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+                               M_AST_INTERN(s1, REG_ITMP1, 0);
                                break;
                        case TYPE_FLT:
-                               s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
-                               M_FST_INTERN(s2, REG_ITMP1, 0);
+                               s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+                               M_FST_INTERN(s1, REG_ITMP1, 0);
                                break;
                        case TYPE_DBL:
-                               s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
-                               M_DST_INTERN(s2, REG_ITMP1, 0);
+                               s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+                               M_DST_INTERN(s1, REG_ITMP1, 0);
                                break;
                        }
                        break;
@@ -2540,44 +2538,43 @@ nowperformreturn:
                        if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
                                disp = dseg_addaddress(cd, LOCK_monitor_exit);
                                M_ALD(REG_ITMP3, REG_PV, disp);
+                               M_ALD(REG_ITMP3, REG_ITMP3, 0); /* TOC */
                                M_MTCTR(REG_ITMP3);
 
                                /* we need to save the proper return value */
 
                                switch (iptr->opc) {
                                case ICMD_LRETURN:
-                                       /*M_IST(REG_RESULT2, REG_SP, rd->memuse * 4 + 8); FIXME*/
-                                       /* fall through */
                                case ICMD_IRETURN:
                                case ICMD_ARETURN:
-                                       M_IST(REG_RESULT , REG_SP, rd->memuse * 4 + 4);
+                                       /* fall through */
+                                       M_LST(REG_RESULT , REG_SP, rd->memuse * 4 + 8);
                                        break;
                                case ICMD_FRETURN:
-                                       M_FST(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+                                       M_FST(REG_FRESULT, REG_SP, rd->memuse * 4 + 8);
                                        break;
                                case ICMD_DRETURN:
-                                       M_DST(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+                                       M_DST(REG_FRESULT, REG_SP, rd->memuse * 4 + 8);
                                        break;
                                }
 
-                               M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 4);
+                               M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8);
                                M_JSR;
 
                                /* and now restore the proper return value */
 
                                switch (iptr->opc) {
                                case ICMD_LRETURN:
-                                       /*M_ILD(REG_RESULT2, REG_SP, rd->memuse * 4 + 8); FIXME*/
-                                       /* fall through */
                                case ICMD_IRETURN:
                                case ICMD_ARETURN:
-                                       M_ILD(REG_RESULT , REG_SP, rd->memuse * 4 + 4);
+                                       /* fall through */
+                                       M_LLD(REG_RESULT , REG_SP, rd->memuse * 4 + 8);
                                        break;
                                case ICMD_FRETURN:
-                                       M_FLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+                                       M_FLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 8);
                                        break;
                                case ICMD_DRETURN:
-                                       M_DLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+                                       M_DLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 8);
                                        break;
                                }
                        }
@@ -2749,10 +2746,10 @@ gen_method:
                                        } else {
                                                if (IS_2_WORD_TYPE(src->type)) {
                                                        d = emit_load_s1(jd, iptr, src, REG_ITMP1);
-                                                       M_LST(d, REG_SP, md->params[s3].regoff * 4);    /* XXX */
+                                                       M_LST(d, REG_SP, md->params[s3].regoff * 8);    /* XXX */
                                                } else {
                                                        d = emit_load_s1(jd, iptr, src, REG_ITMP1);
-                                                       M_IST(d, REG_SP, md->params[s3].regoff * 4);
+                                                       M_LST(d, REG_SP, md->params[s3].regoff * 8);
                                                }
                                        }
                                                
@@ -2765,9 +2762,9 @@ gen_method:
                                        } else {
                                                d = emit_load_s1(jd, iptr, src, REG_FTMP1);
                                                if (IS_2_WORD_TYPE(src->type))
-                                                       M_DST(d, REG_SP, md->params[s3].regoff * 4);
+                                                       M_DST(d, REG_SP, md->params[s3].regoff * 8);
                                                else
-                                                       M_FST(d, REG_SP, md->params[s3].regoff * 4);
+                                                       M_FST(d, REG_SP, md->params[s3].regoff * 8);
                                        }
                                }
                        } /* end of for */
@@ -3684,7 +3681,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
        stackframesize =
                sizeof(stackframeinfo) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
-               4 +                             /* 4 stackframeinfo arguments (darwin)*/
+               4 +                            /* 4 stackframeinfo arguments (darwin)*/
                nmd->paramcount  + 
                nmd->memuse;
 
@@ -3693,7 +3690,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
        /* create method header */
 
        (void) dseg_addaddress(cd, code);                      /* CodeinfoPointer */
-       (void) dseg_adds4(cd, stackframesize * 4);             /* FrameSize       */
+       (void) dseg_adds4(cd, stackframesize * 8);             /* FrameSize       */
        (void) dseg_adds4(cd, 0);                              /* IsSync          */
        (void) dseg_adds4(cd, 0);                              /* IsLeaf          */
        (void) dseg_adds4(cd, 0);                              /* IntSave         */
@@ -3762,6 +3759,10 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
        M_MTCTR(REG_ITMP1);
        M_JSR;
 
+       M_NOP;
+       M_NOP;
+       M_NOP;
+
        /* restore integer and float argument registers */
 
        j = 0;
@@ -3852,6 +3853,10 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
        M_MTCTR(REG_ITMP3);
        M_JSR;
 
+       M_NOP;
+       M_NOP;
+       M_NOP;
+
        /* save return value */
 
        if (md->returntype.type != TYPE_VOID) {
@@ -3874,6 +3879,10 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 
        /* remove native stackframe info */
 
+       M_NOP;
+       M_NOP;
+       M_NOP;
+
        M_AADD_IMM(REG_SP, stackframesize * 8, rd->argintregs[0]);
        disp = dseg_addaddress(cd, codegen_finish_native_call);
        M_ALD(REG_ITMP1, REG_PV, disp);
inofficial http://www.cacaojvm.org/ git mirror