* src/vm/jit/powerpc/darwin/md-abi.h (REG_ITMP12_PACKED): Added.

[cacao.git] / src / vm / jit / powerpc / darwin / md-abi.c

diff --git a/src/vm/jit/powerpc/darwin/md-abi.c b/src/vm/jit/powerpc/darwin/md-abi.c
index 179f24beb2abe3fe3a42fb3f0c59b29017f37a39..52affa663b35e13eb256d5891575fc54effc31d2 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 5073 2006-07-04 16:02:19Z twisti $
+   $Id: md-abi.c 5084 2006-07-06 22:52:23Z twisti $
 
 */
 
@@ -225,37 +225,49 @@ 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. */
 
                if (!(stackslot->flags & SAVEDVAR)) {
                        stackslot->varkind = ARGVAR;
-                       stackslot->varnum = -1;
-                       stackslot->flags = 0;
+                       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;
 
                                        stackslot->regoff = REG_RESULT;
-
-                               } else {
+                               }
+                               else {
                                        if (rd->argintreguse < 2)
                                                rd->argintreguse = 2;
 
-                                       stackslot->regoff = PACK_REGS(REG_RESULT2, REG_RESULT);
+                                       stackslot->regoff = REG_RESULT_PACKED;
                                }
-
-                       } else { /* float/double */
+                       }
+                       else {
                                if (rd->argfltreguse < 1)
                                        rd->argfltreguse = 1;