Merged revisions 8245-8298 via svnmerge from

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

diff --git a/src/vm/jit/powerpc/linux/md-abi.c b/src/vm/jit/powerpc/linux/md-abi.c
index 5554fea240c14044938ca18f5385278f8d590770..bb5bb932daf157e87948249f9770d34da5075660 100644 (file)
--- a/src/vm/jit/powerpc/linux/md-abi.c
+++ b/src/vm/jit/powerpc/linux/md-abi.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-abi.c 8190 2007-07-08 13:42:06Z twisti $
+   $Id: md-abi.c 8270 2007-08-08 13:57:12Z twisti $
 
 */
 
@@ -43,7 +43,7 @@
 
 /* register descripton arrays *************************************************/
 
-int32_t nregdescint[] = {
+int nregdescint[] = {
        /* zero,      sp, NO(sys),   a0/v0,   a1/v1,      a2,      a3,      a4,   */
        REG_RES, REG_RES, REG_RES, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
 
@@ -66,7 +66,7 @@ const char *abi_registers_integer_name[] = {
        "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31",
 };
 
-const int32_t abi_registers_integer_argument[] = {
+const int abi_registers_integer_argument[] = {
        3,  /* a0 */
        4,  /* a1 */
        5,  /* a2 */
@@ -77,7 +77,7 @@ const int32_t abi_registers_integer_argument[] = {
        10, /* a7 */
 };
 
-const int32_t abi_registers_integer_saved[] = {
+const int abi_registers_integer_saved[] = {
        14, /* s0 */
        15, /* s1 */
        24, /* s2 */
@@ -90,7 +90,7 @@ const int32_t abi_registers_integer_saved[] = {
        31, /* s9 */
 };
 
-const int32_t abi_registers_integer_temporary[] = {
+const int abi_registers_integer_temporary[] = {
        17, /* t0 */
        18, /* t1 */
        19, /* t2 */
@@ -101,7 +101,7 @@ const int32_t abi_registers_integer_temporary[] = {
 };
 
 
-int32_t nregdescfloat[] = {
+int nregdescfloat[] = {
        /*ftmp3,  fa0/v0,     fa1,     fa2,     fa3,     fa4,     fa5,     fa6,   */
        REG_RES, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
 
@@ -118,7 +118,7 @@ int32_t nregdescfloat[] = {
 };
 
 
-const int32_t abi_registers_float_argument[] = {
+const int abi_registers_float_argument[] = {
        1,  /* fa0  */
        2,  /* fa1  */
        3,  /* fa2  */
@@ -129,7 +129,7 @@ const int32_t abi_registers_float_argument[] = {
        8,  /* fa7  */
 };
 
-const int32_t abi_registers_float_saved[] = {
+const int abi_registers_float_saved[] = {
        14, /* fs0  */
        15, /* fs1  */
        24, /* fs2  */
@@ -142,7 +142,7 @@ const int32_t abi_registers_float_saved[] = {
        31, /* fs9  */
 };
 
-const int32_t abi_registers_float_temporary[] = {
+const int abi_registers_float_temporary[] = {
        9,  /* ft0  */
        10, /* ft1  */
        11, /* ft2  */
@@ -177,10 +177,114 @@ const int32_t abi_registers_float_temporary[] = {
 void md_param_alloc(methoddesc *md)
 {
        paramdesc *pd;
-       int32_t    i;
-       int32_t    iarg;
-       int32_t    farg;
-       int32_t    stacksize;
+       int        i;
+       int        iarg;
+       int        farg;
+       int        stacksize;
+
+       /* set default values */
+
+       iarg = 0;
+       farg = 0;
+       stacksize = LA_SIZE_IN_POINTERS;
+
+       /* get params field of methoddesc */
+
+       pd = md->params;
+
+       for (i = 0; i < md->paramcount; i++, pd++) {
+               switch (md->paramtypes[i].type) {
+               case TYPE_INT:
+               case TYPE_ADR:
+                       if (iarg < INT_ARG_CNT) {
+                               pd->inmemory = false;
+                               pd->index    = iarg;
+                               pd->regoff   = abi_registers_integer_argument[iarg];
+                               iarg++;
+                       }
+                       else {
+                               pd->inmemory = true;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
+                               stacksize++;
+                       }
+                       break;
+
+               case TYPE_LNG:
+                       if (iarg < INT_ARG_CNT - 1) {
+                               ALIGN_2(iarg);
+                               pd->inmemory = false;
+                               pd->index    = PACK_REGS(iarg + 1, iarg);
+                               pd->regoff   =
+                                       PACK_REGS(abi_registers_integer_argument[iarg + 1],
+                                                         abi_registers_integer_argument[iarg]);
+                               iarg += 2;
+                       }
+                       else {
+                               pd->inmemory = true;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
+                               iarg         = INT_ARG_CNT;
+                               stacksize++;
+                       }
+                       break;
+
+               case TYPE_FLT:
+               case TYPE_DBL:
+                       if (farg < FLT_ARG_CNT) {
+                               pd->inmemory = false;
+                               pd->index    = farg;
+                               pd->regoff   = abi_registers_float_argument[farg];
+                               farg++;
+                       }
+                       else {
+                               pd->inmemory = true;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
+                               stacksize++;
+                       }
+                       break;
+
+               default:
+                       assert(0);
+               }
+       }
+
+       /* Since R3/R4, F1 (==A0/A1, A0) are used for passing return
+          values, this argument register usage has to be regarded,
+          too. */
+
+       if (IS_INT_LNG_TYPE(md->returntype.type)) {
+               if (iarg < (IS_2_WORD_TYPE(md->returntype.type) ? 2 : 1))
+                       iarg = IS_2_WORD_TYPE(md->returntype.type) ? 2 : 1;
+       }
+       else {
+               if (IS_FLT_DBL_TYPE(md->returntype.type))
+                       if (farg < 1)
+                               farg = 1;
+       }
+
+       /* fill register and stack usage */
+
+       md->argintreguse = iarg;
+       md->argfltreguse = farg;
+       md->memuse       = stacksize;
+}
+
+
+/* md_param_alloc_native *******************************************************
+
+   Pre-allocate arguments according the native ABI.
+
+*******************************************************************************/
+
+void md_param_alloc_native(methoddesc *md)
+{
+       paramdesc *pd;
+       int        i;
+       int        iarg;
+       int        farg;
+       int        stacksize;
 
        /* set default values */
 
@@ -280,21 +384,6 @@ void md_param_alloc(methoddesc *md)
 }
 
 
-/* md_param_alloc_native *******************************************************
-
-   Pre-allocate arguments according the native ABI.
-
-*******************************************************************************/
-
-void md_param_alloc_native(methoddesc *md)
-{
-       /* On PowerPC we use the same ABI for JIT method calls as for
-          native method calls. */
-
-       md_param_alloc(md);
-}
-
-
 /* md_return_alloc *************************************************************
 
    Precolor the Java Stackelement containing the Return Value, if