* src/vm/jit/code.c (code_find_codeinfo_for_pc): Use void* instead of

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

diff --git a/src/vm/jit/x86_64/md-abi.c b/src/vm/jit/x86_64/md-abi.c
index 111ee462320bd5a1a72ad8759312e428828e39c5..95b1c1e785432c116411a30255dc065a49b52a88 100644 (file)
--- a/src/vm/jit/x86_64/md-abi.c
+++ b/src/vm/jit/x86_64/md-abi.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-abi.c 7486 2007-03-08 13:50:07Z twisti $
-
 */
 
 
@@ -34,6 +32,7 @@
 
 #include "vm/global.h"
 
+#include "vm/jit/abi.h"
 #include "vm/jit/jit.h" /* for REG_* (maybe can be removed) */
 
 #include "vmcore/descriptor.h"
@@ -52,6 +51,37 @@ const char *abi_registers_integer_name[] = {
        "r8",  "r9",  "r10", "r11", "r12", "r13", "r14", "r15"
 };
 
+const s4 abi_registers_integer_argument[] = {
+       7,  /* a0 */
+       6,  /* a1 */
+       2,  /* a2 */
+       1,  /* a3 */
+       8,  /* a4 */
+       9,  /* a5 */
+};
+
+const s4 abi_registers_integer_saved[] = {
+       5,  /* s0 */
+       12, /* s1 */
+       13, /* s2 */
+       14, /* s3 */
+       15, /* s4 */
+};
+
+const s4 abi_registers_integer_temporary[] = {
+       3,  /* t0 */
+};
+
+
+/* float registers *************************************************************
+
+   xmm0,   xmm1,   xmm2,   xmm3,   xmm4,   xmm5,   xmm6,   xmm7,
+   (fa0)   (fa1)   (fa2)   (fa3)   (fa4)   (fa5)   (fa6)   (fa7)
+
+   xmm8,   xmm9,   xmm10,  xmm11,  xmm12,  xmm13,  xmm14,  xmm15
+   (ftmp1) (ftmp2) (ftmp3) (ft0)   (ft1)   (ft2)   (ft3)   (ft4)
+
+*******************************************************************************/
 
 s4 nregdescfloat[] = {
     REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
@@ -60,6 +90,30 @@ s4 nregdescfloat[] = {
 };
 
 
+const s4 abi_registers_float_argument[] = {
+       0,  /* fa0 */
+       1,  /* fa1 */
+       2,  /* fa2 */
+       3,  /* fa3 */
+       4,  /* fa4 */
+       5,  /* fa5 */
+       6,  /* fa6 */
+       7,  /* fa7 */
+};
+
+const s4 abi_registers_float_saved[] = {
+       -1,
+};
+
+const s4 abi_registers_float_temporary[] = {
+       11, /* ft0 */
+       12, /* ft1 */
+       13, /* ft2 */
+       14, /* ft3 */
+       15, /* ft4 */
+};
+
+
 /* md_param_alloc **************************************************************
 
    XXX
@@ -76,8 +130,8 @@ void md_param_alloc(methoddesc *md)
 
        /* set default values */
 
-       iarg = 0;
-       farg = 0;
+       iarg      = 0;
+       farg      = 0;
        stacksize = 0;
 
        /* get params field of methoddesc */
@@ -91,12 +145,14 @@ void md_param_alloc(methoddesc *md)
                case TYPE_LNG:
                        if (iarg < INT_ARG_CNT) {
                                pd->inmemory = false;
-                               pd->regoff   = iarg;
+                               pd->index    = iarg;
+                               pd->regoff   = abi_registers_integer_argument[iarg];
                                iarg++;
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
                                stacksize++;
                        }
                        break;
@@ -105,12 +161,14 @@ void md_param_alloc(methoddesc *md)
                case TYPE_DBL:
                        if (farg < FLT_ARG_CNT) {
                                pd->inmemory = false;
-                               pd->regoff   = farg;
+                               pd->index    = farg;
+                               pd->regoff   = abi_registers_float_argument[farg];
                                farg++;
                        }
                        else {
                                pd->inmemory = true;
-                               pd->regoff   = stacksize;
+                               pd->index    = stacksize;
+                               pd->regoff   = stacksize * 8;
                                stacksize++;
                        }
                        break;
@@ -171,13 +229,15 @@ void md_param_alloc_native(methoddesc *md)
 void md_return_alloc(jitdata *jd, stackptr stackslot)
 {
        methodinfo   *m;
+       codeinfo     *code;
        registerdata *rd;
        methoddesc   *md;
 
        /* get required compiler data */
 
-       m  = jd->m;
-       rd = jd->rd;
+       m    = jd->m;
+       code = jd->code;
+       rd   = jd->rd;
 
        md = m->parseddesc;
 
@@ -191,7 +251,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
                   to their argument register -> so leafmethods with
                   paramcount > 0 could already use a00! */
 
-               if (!jd->isleafmethod || (md->paramcount == 0)) {
+               if (!code_is_leafmethod(code) || (md->paramcount == 0)) {
                        /* Only precolor the stackslot, if it is not a SAVEDVAR
                           <-> has not to survive method invokations */