* Removed all Id tags.

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

diff --git a/src/vm/jit/mips/md-abi.c b/src/vm/jit/mips/md-abi.c
index 6285a099ea13dabb2b15dfa52a29874d921dd64d..1b3065edf3b80ce477aa745496fc87d644b46d82 100644 (file)
--- a/src/vm/jit/mips/md-abi.c
+++ b/src/vm/jit/mips/md-abi.c
@@ -22,21 +22,25 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-abi.c 8011 2007-06-05 10:06:18Z twisti $
-
 */
 
 
 #include "config.h"
+
+#include <stdarg.h>
+
 #include "vm/types.h"
 
 #include "vm/jit/mips/md-abi.h"
 
+#include "mm/memory.h"
+
 #include "vm/global.h"
 
 #include "vm/jit/abi.h"
 
 #include "vmcore/descriptor.h"
+#include "vmcore/method.h"
 
 
 /* register descripton array **************************************************/
@@ -281,7 +285,7 @@ void md_param_alloc(methoddesc *md)
                case TYPE_INT:
                case TYPE_ADR:
                case TYPE_LNG:
-                       if (i < INT_ARG_CNT) {
+                       if (reguse < INT_ARG_CNT) {
                                pd->inmemory = false;
                                pd->regoff   = abi_registers_integer_argument[reguse];
                                reguse++;
@@ -289,13 +293,14 @@ void md_param_alloc(methoddesc *md)
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->regoff   = stacksize * 8;
                                stacksize++;
                        }
                        break;
+
                case TYPE_FLT:
                case TYPE_DBL:
-                       if (i < FLT_ARG_CNT) {
+                       if (reguse < FLT_ARG_CNT) {
                                pd->inmemory = false;
                                pd->regoff   = abi_registers_float_argument[reguse];
                                reguse++;
@@ -303,7 +308,7 @@ void md_param_alloc(methoddesc *md)
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->regoff   = stacksize * 8;
                                stacksize++;
                        }
                        break;
@@ -330,13 +335,15 @@ void md_param_alloc(methoddesc *md)
                case TYPE_ADR:
                        if (reguse < INT_ARG_CNT) {
                                pd->inmemory = false;
+                               pd->index    = reguse;
                                pd->regoff   = abi_registers_integer_argument[reguse];
                                reguse++;
                                md->argintreguse = reguse;
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
                                stacksize++;
                        }
                        break;
@@ -347,10 +354,12 @@ void md_param_alloc(methoddesc *md)
                        if (reguse < INT_ARG_CNT) {
                                pd->inmemory = false;
 #  if WORDS_BIGENDIAN == 1
+                               pd->index    = PACK_REGS(reguse + 1, reguse);
                                pd->regoff   =
                                        PACK_REGS(abi_registers_integer_argument[reguse + 1],
                                                          abi_registers_integer_argument[reguse]);
 #  else
+                               pd->index    = PACK_REGS(reguse, reguse + 1);
                                pd->regoff   =
                                        PACK_REGS(abi_registers_integer_argument[reguse],
                                                          abi_registers_integer_argument[reguse + 1]);
@@ -360,7 +369,8 @@ void md_param_alloc(methoddesc *md)
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
                                stacksize++;
                        }
                        break;
@@ -369,13 +379,15 @@ void md_param_alloc(methoddesc *md)
                case TYPE_DBL:
                        if (reguse < FLT_ARG_CNT) {
                                pd->inmemory = false;
+                               pd->index    = reguse;
                                pd->regoff   = abi_registers_float_argument[reguse];
                                reguse++;
                                md->argfltreguse = reguse;
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
                                stacksize++;
                        }
                        break;
@@ -404,7 +416,7 @@ void md_param_alloc(methoddesc *md)
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->regoff   = stacksize * 8;
                        }
                        stacksize++;
                        break;
@@ -429,7 +441,7 @@ void md_param_alloc(methoddesc *md)
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->regoff   = stacksize * 8;
                        }
                        stacksize += 2;
                        break;
@@ -529,7 +541,7 @@ void md_param_alloc_native(methoddesc *md)
                                        ALIGN_2(stacksize);
 
                                        pd->inmemory = true;
-                                       pd->regoff   = stacksize;
+                                       pd->regoff   = stacksize * 4;
                                }
                                stacksize += 2;
                        }
@@ -544,7 +556,7 @@ void md_param_alloc_native(methoddesc *md)
                                }
                                else {
                                        pd->inmemory = true;
-                                       pd->regoff   = stacksize;
+                                       pd->regoff   = stacksize * 4;
                                }
                                stacksize++;
                        }
@@ -569,7 +581,7 @@ void md_param_alloc_native(methoddesc *md)
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->regoff   = stacksize * 4;
                        }
                        stacksize++;
                        break;
@@ -593,7 +605,7 @@ void md_param_alloc_native(methoddesc *md)
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->regoff   = stacksize * 4;
                        }
                        stacksize += 2;
                        break;
@@ -601,11 +613,12 @@ void md_param_alloc_native(methoddesc *md)
        }
 
 # endif /* !defined(ENABLE_SOFT_FLOAT) */
-#endif /* SIZEOF_VOID_P == 8 */
 
        /* fill register and stack usage */
 
        md->memuse = stacksize;
+
+#endif /* SIZEOF_VOID_P == 8 */
 }