* 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 c90e0c61dfb89a32914383e074366a1aa1dcf43b..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 8123 2007-06-20 23:50:55Z michi $
-
 */
 
 
@@ -63,7 +61,7 @@ const s4 abi_registers_integer_argument[] = {
 };
 
 const s4 abi_registers_integer_saved[] = {
-       7,  /* s0 */
+       5,  /* s0 */
        12, /* s1 */
        13, /* s2 */
        14, /* s3 */
@@ -231,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;
 
@@ -251,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 */