* src/vm/global.h: Added definition of MIN macro with guard.

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

diff --git a/src/vm/jit/sparc64/md-abi.c b/src/vm/jit/sparc64/md-abi.c
index a7ea007bd2a0fe38bd54a5d1ef9b4cfeef123f83..e41cfb5505a7498eb571cbe974e8ad80ded55328 100644 (file)
--- a/src/vm/jit/sparc64/md-abi.c
+++ b/src/vm/jit/sparc64/md-abi.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/sparc64/md-abi.c - functions for Sparc ABI
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-abi.h 4357 2006-01-22 23:33:38Z twisti $
-
 */
 
 
@@ -32,18 +28,16 @@
 
 #include "vm/jit/sparc64/md-abi.h"
 
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
 
 #include "vm/jit/abi.h"
-
-#include "vmcore/descriptor.h"
+#include "vm/jit/stack.h"
 
 /* temp */
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include <assert.h>
 
-/* helper macros for allocation methods ***************************************/
-#define MIN(a,b) (((a) <= (b)) ? (a) : (b))
 
 /* register descripton array **************************************************/
 
@@ -58,8 +52,8 @@ s4 nregdescint[] = {
        /* l0    l1       l2       l3       l4       l5       l6       l7     */
        REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV,
        
-       /* i0/v0 i1       i2       i3       i4       pv/i5    fp/i6    ra/i7  */
-       REG_RET, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_RES, REG_RES, REG_RES,
+       /* i0    i1       i2       i3       i4       pv/i5    fp/i6    ra/i7  */
+       REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_RES, REG_RES, REG_RES,
        REG_END
 };
 
@@ -87,6 +81,7 @@ const s4 abi_registers_integer_saved[] = {
        21, /* l5  */
        22, /* l6  */
        23, /* l7  */
+       24, /* i0  */
        25, /* i1  */
        26, /* i2  */
        27, /* i3  */
@@ -165,13 +160,15 @@ void md_param_alloc(methoddesc *md)
                case TYPE_LNG:
                        if (i < 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;
@@ -180,17 +177,20 @@ void md_param_alloc(methoddesc *md)
                case TYPE_DBL:
                        if (i < 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;
                }
+               assert(pd->regoff != 26);
        }
        
        /* Since O0 is used for passing return values, this */
@@ -220,10 +220,11 @@ void md_param_alloc_native(methoddesc *md)
        s4         stacksize;
        s4         min_nat_regs;
 
+       /* Note: regoff will be set relative to a stack base of $sp+16 */
+        
        /* set default values */
-
        reguse = 0;
-       stacksize = 6;
+       stacksize = 6; /* abi params: allocated, but not used */
 
        /* when we are above this, we have to increase the stacksize with every */
        /* single argument to create the proper argument array                  */
@@ -240,18 +241,15 @@ void md_param_alloc_native(methoddesc *md)
                case TYPE_LNG:
                        if (i < INT_NATARG_CNT) {
                                pd->inmemory = false;
-                               pd->regoff = reguse;
+                               pd->regoff = nat_argintregs[reguse];
                                reguse++;
                                md->argintreguse = reguse;
 
                        } else {
                                pd->inmemory = true;
-                               pd->regoff = reguse;
+                               pd->regoff = reguse * 8;
                                reguse++;
                        }
-
-                       if (i >= min_nat_regs)
-                               stacksize++;
                        break;
                case TYPE_FLT:
                case TYPE_DBL:
@@ -262,14 +260,15 @@ void md_param_alloc_native(methoddesc *md)
                                md->argfltreguse = reguse;
                        } else {
                                pd->inmemory = true;
-                               pd->regoff = reguse;
+                               pd->regoff = reguse * 8;
                                reguse++;
                        }
 
-                       if (i >= min_nat_regs)
-                               stacksize++;
                        break;
                }
+
+               if (i >= min_nat_regs)
+                       stacksize++;
        }
        
        /* Since O0 is used for passing return values, this */
@@ -290,7 +289,7 @@ void md_param_alloc_native(methoddesc *md)
 
 *******************************************************************************/
 
-void md_return_alloc(jitdata *jd, stackptr stackslot)
+void md_return_alloc(jitdata *jd, stackelement_t* stackslot)
 {
        /* XXX */
 }