Merged with tip.
[cacao.git] / src / vm / jit / i386 / emit.c
index 5ff1011f43ee2efa5a95aaef3cb38eb77c54574e..7c61037afcaf40aa14b4b3befe25e6f81290c25b 100644 (file)
@@ -1,9 +1,7 @@
 /* src/vm/jit/i386/emit.c - i386 code emitter functions
 
-   Copyright (C) 1996-2005, 2006, 2007 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, 2007, 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: emit.c 7483 2007-03-08 13:17:40Z michi $
-
 */
 
 
 
 #include "mm/memory.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
 
-#include "vm/builtin.h"
+#include "vm/exceptions.h"
 
+#include "vm/jit/abi.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/dseg.h"
 #include "vm/jit/emit-common.h"
 #include "vm/jit/jit.h"
+#include "vm/jit/patcher-common.h"
 #include "vm/jit/replace.h"
+#include "vm/jit/trace.h"
+#include "vm/jit/trap.h"
 
 #include "vmcore/options.h"
 #include "vmcore/statistics.h"
@@ -74,19 +72,24 @@ inline s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
        if (IS_INMEMORY(src->flags)) {
                COUNT_SPILLS;
 
-               disp = src->vv.regoff * 4;
-
-               if (IS_FLT_DBL_TYPE(src->type)) {
-                       if (IS_2_WORD_TYPE(src->type))
-                               M_DLD(tempreg, REG_SP, disp);
-                       else
-                               M_FLD(tempreg, REG_SP, disp);
-               }
-               else {
-                       if (IS_2_WORD_TYPE(src->type))
-                               M_LLD(tempreg, REG_SP, disp);
-                       else
-                               M_ILD(tempreg, REG_SP, disp);
+               disp = src->vv.regoff;
+
+               switch (src->type) {
+               case TYPE_INT:
+               case TYPE_ADR:
+                       M_ILD(tempreg, REG_SP, disp);
+                       break;
+               case TYPE_LNG:
+                       M_LLD(tempreg, REG_SP, disp);
+                       break;
+               case TYPE_FLT:
+                       M_FLD(tempreg, REG_SP, disp);
+                       break;
+               case TYPE_DBL:
+                       M_DLD(tempreg, REG_SP, disp);
+                       break;
+               default:
+                       vm_abort("emit_load: unknown type %d", src->type);
                }
 
                reg = tempreg;
@@ -120,7 +123,7 @@ inline s4 emit_load_low(jitdata *jd, instruction *iptr, varinfo *src,s4 tempreg)
        if (IS_INMEMORY(src->flags)) {
                COUNT_SPILLS;
 
-               disp = src->vv.regoff * 4;
+               disp = src->vv.regoff;
 
                M_ILD(tempreg, REG_SP, disp);
 
@@ -154,7 +157,7 @@ inline s4 emit_load_high(jitdata *jd, instruction *iptr,varinfo *src,s4 tempreg)
        if (IS_INMEMORY(src->flags)) {
                COUNT_SPILLS;
 
-               disp = src->vv.regoff * 4;
+               disp = src->vv.regoff;
 
                M_ILD(tempreg, REG_SP, disp + 4);
 
@@ -176,6 +179,7 @@ inline s4 emit_load_high(jitdata *jd, instruction *iptr,varinfo *src,s4 tempreg)
 inline void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 {
        codegendata  *cd;
+       s4            disp;
 
        /* get required compiler data */
 
@@ -184,17 +188,24 @@ inline void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
        if (IS_INMEMORY(dst->flags)) {
                COUNT_SPILLS;
 
-               if (IS_FLT_DBL_TYPE(dst->type)) {
-                       if (IS_2_WORD_TYPE(dst->type))
-                               M_DST(d, REG_SP, dst->vv.regoff * 4);
-                       else
-                               M_FST(d, REG_SP, dst->vv.regoff * 4);
-               }
-               else {
-                       if (IS_2_WORD_TYPE(dst->type))
-                               M_LST(d, REG_SP, dst->vv.regoff * 4);
-                       else
-                               M_IST(d, REG_SP, dst->vv.regoff * 4);
+               disp = dst->vv.regoff;
+
+               switch (dst->type) {
+               case TYPE_INT:
+               case TYPE_ADR:
+                       M_IST(d, REG_SP, disp);
+                       break;
+               case TYPE_LNG:
+                       M_LST(d, REG_SP, disp);
+                       break;
+               case TYPE_FLT:
+                       M_FST(d, REG_SP, disp);
+                       break;
+               case TYPE_DBL:
+                       M_DST(d, REG_SP, disp);
+                       break;
+               default:
+                       vm_abort("emit_store: unknown type %d", dst->type);
                }
        }
 }
@@ -219,7 +230,7 @@ inline void emit_store_low(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 
        if (IS_INMEMORY(dst->flags)) {
                COUNT_SPILLS;
-               M_IST(GET_LOW_REG(d), REG_SP, dst->vv.regoff * 4);
+               M_IST(GET_LOW_REG(d), REG_SP, dst->vv.regoff);
        }
 }
 
@@ -243,7 +254,7 @@ inline void emit_store_high(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 
        if (IS_INMEMORY(dst->flags)) {
                COUNT_SPILLS;
-               M_IST(GET_HIGH_REG(d), REG_SP, dst->vv.regoff * 4 + 4);
+               M_IST(GET_HIGH_REG(d), REG_SP, dst->vv.regoff + 4);
        }
 }
 
@@ -254,18 +265,30 @@ inline void emit_store_high(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 
 *******************************************************************************/
 
-void emit_copy(jitdata *jd, instruction *iptr, varinfo *src, varinfo *dst)
+void emit_copy(jitdata *jd, instruction *iptr)
 {
-       codegendata  *cd;
-       s4            s1, d;
+       codegendata *cd;
+       varinfo     *src;
+       varinfo     *dst;
+       s4           s1, d;
 
        /* get required compiler data */
 
        cd = jd->cd;
 
+       /* get source and destination variables */
+
+       src = VAROP(iptr->s1);
+       dst = VAROP(iptr->dst);
+
        if ((src->vv.regoff != dst->vv.regoff) ||
                ((src->flags ^ dst->flags) & INMEMORY)) {
 
+               if ((src->type == TYPE_RET) || (dst->type == TYPE_RET)) {
+                       /* emit nothing, as the value won't be used anyway */
+                       return;
+               }
+
                /* If one of the variables resides in memory, we can eliminate
                   the register move from/to the temporary register with the
                   order of getting the destination register and the load. */
@@ -288,13 +311,20 @@ void emit_copy(jitdata *jd, instruction *iptr, varinfo *src, varinfo *dst)
                }
 
                if (s1 != d) {
-                       if (IS_FLT_DBL_TYPE(src->type)) {
+                       switch (src->type) {
+                       case TYPE_INT:
+                       case TYPE_ADR:
+                               M_MOV(s1, d);
+                               break;
+                       case TYPE_LNG:
+                               M_LNGMOVE(s1, d);
+                               break;
+                       case TYPE_FLT:
+                       case TYPE_DBL:
 /*                             M_FMOV(s1, d); */
-                       } else {
-                               if (IS_2_WORD_TYPE(src->type))
-                                       M_LNGMOVE(s1, d);
-                               else
-                    M_MOV(s1, d);
+                               break;
+                       default:
+                               vm_abort("emit_copy: unknown type %d", src->type);
                        }
                }
 
@@ -303,6 +333,71 @@ void emit_copy(jitdata *jd, instruction *iptr, varinfo *src, varinfo *dst)
 }
 
 
+/* emit_branch *****************************************************************
+
+   Emits the code for conditional and unconditional branchs.
+
+*******************************************************************************/
+
+void emit_branch(codegendata *cd, s4 disp, s4 condition, s4 reg, u4 options)
+{
+       s4 branchdisp;
+
+       /* ATTENTION: a displacement overflow cannot happen */
+
+       /* check which branch to generate */
+
+       if (condition == BRANCH_UNCONDITIONAL) {
+
+               /* calculate the different displacements */
+
+               branchdisp = disp - BRANCH_UNCONDITIONAL_SIZE;
+
+               M_JMP_IMM(branchdisp);
+       }
+       else {
+               /* calculate the different displacements */
+
+               branchdisp = disp - BRANCH_CONDITIONAL_SIZE;
+
+               switch (condition) {
+               case BRANCH_EQ:
+                       M_BEQ(branchdisp);
+                       break;
+               case BRANCH_NE:
+                       M_BNE(branchdisp);
+                       break;
+               case BRANCH_LT:
+                       M_BLT(branchdisp);
+                       break;
+               case BRANCH_GE:
+                       M_BGE(branchdisp);
+                       break;
+               case BRANCH_GT:
+                       M_BGT(branchdisp);
+                       break;
+               case BRANCH_LE:
+                       M_BLE(branchdisp);
+                       break;
+               case BRANCH_ULT:
+                       M_BB(branchdisp);
+                       break;
+               case BRANCH_ULE:
+                       M_BBE(branchdisp);
+                       break;
+               case BRANCH_UGE:
+                       M_BAE(branchdisp);
+                       break;
+               case BRANCH_UGT:
+                       M_BA(branchdisp);
+                       break;
+               default:
+                       vm_abort("emit_branch: unknown condition %d", condition);
+               }
+       }
+}
+
+
 /* emit_arithmetic_check *******************************************************
 
    Emit an ArithmeticException check.
@@ -313,8 +408,8 @@ void emit_arithmetic_check(codegendata *cd, instruction *iptr, s4 reg)
 {
        if (INSTRUCTION_MUST_CHECK(iptr)) {
                M_TEST(reg);
-               M_BEQ(0);
-               codegen_add_arithmeticexception_ref(cd);
+               M_BNE(6);
+               M_ALD_MEM(reg, TRAP_ArithmeticException);
        }
 }
 
@@ -328,10 +423,26 @@ void emit_arithmetic_check(codegendata *cd, instruction *iptr, s4 reg)
 void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1, s4 s2)
 {
        if (INSTRUCTION_MUST_CHECK(iptr)) {
-        M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));
+        M_ILD(REG_ITMP3, s1, OFFSET(java_array_t, size));
         M_CMP(REG_ITMP3, s2);
-        M_BAE(0);
-        codegen_add_arrayindexoutofboundsexception_ref(cd, s2);
+        M_BB(6);
+               M_ALD_MEM(s2, TRAP_ArrayIndexOutOfBoundsException);
+       }
+}
+
+
+/* emit_arraystore_check *******************************************************
+
+   Emit an ArrayStoreException check.
+
+*******************************************************************************/
+
+void emit_arraystore_check(codegendata *cd, instruction *iptr)
+{
+       if (INSTRUCTION_MUST_CHECK(iptr)) {
+               M_TEST(REG_RESULT);
+               M_BNE(6);
+               M_ALD_MEM(REG_RESULT, TRAP_ArrayStoreException);
        }
 }
 
@@ -344,7 +455,22 @@ void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1,
 
 void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 reg, s4 s1)
 {
-       vm_abort("IMPLEMENT ME!");
+       if (INSTRUCTION_MUST_CHECK(iptr)) {
+               switch (condition) {
+               case BRANCH_LE:
+                       M_BGT(6);
+                       break;
+               case BRANCH_EQ:
+                       M_BNE(6);
+                       break;
+               case BRANCH_ULE:
+                       M_BBE(6);
+                       break;
+               default:
+                       vm_abort("emit_classcast_check: unknown condition %d", condition);
+               }
+               M_ALD_MEM(s1, TRAP_ClassCastException);
+       }
 }
 
 
@@ -358,246 +484,80 @@ void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg)
 {
        if (INSTRUCTION_MUST_CHECK(iptr)) {
                M_TEST(reg);
-               M_BEQ(0);
-               codegen_add_nullpointerexception_ref(cd);
+               M_BNE(6);
+               M_ALD_MEM(reg, TRAP_NullPointerException);
        }
 }
 
 
-/* emit_exception_stubs ********************************************************
+/* emit_exception_check ********************************************************
 
-   Generates the code for the exception stubs.
+   Emit an Exception check.
 
 *******************************************************************************/
 
-void emit_exception_stubs(jitdata *jd)
+void emit_exception_check(codegendata *cd, instruction *iptr)
 {
-       codegendata  *cd;
-       registerdata *rd;
-       exceptionref *er;
-       s4            branchmpc;
-       s4            targetmpc;
-       s4            targetdisp;
-
-       /* get required compiler data */
-
-       cd = jd->cd;
-       rd = jd->rd;
-
-       /* generate exception stubs */
-
-       targetdisp = 0;
-
-       for (er = cd->exceptionrefs; er != NULL; er = er->next) {
-               /* back-patch the branch to this exception code */
-
-               branchmpc = er->branchpos;
-               targetmpc = cd->mcodeptr - cd->mcodebase;
-
-               md_codegen_patch_branch(cd, branchmpc, targetmpc);
-
-               MCODECHECK(512);
-
-               /* Check if the exception is an
-                  ArrayIndexOutOfBoundsException.  If so, move index register
-                  into REG_ITMP1. */
-
-               if (er->reg != -1)
-                       M_INTMOVE(er->reg, REG_ITMP1);
-
-               /* calcuate exception address */
-
-               M_MOV_IMM(0, REG_ITMP2_XPC);
-               dseg_adddata(cd);
-               M_AADD_IMM32(er->branchpos - 6, REG_ITMP2_XPC);
-
-               /* move function to call into REG_ITMP3 */
-
-               M_MOV_IMM(er->function, REG_ITMP3);
-
-               if (targetdisp == 0) {
-                       targetdisp = cd->mcodeptr - cd->mcodebase;
-
-                       M_ASUB_IMM(5 * 4, REG_SP);
-
-                       /* first store REG_ITMP1 so we can use it */
-
-                       M_AST(REG_ITMP1, REG_SP, 4 * 4);                    /* for AIOOBE */
-
-                       M_AST_IMM(0, REG_SP, 0 * 4);
-                       dseg_adddata(cd);
-                       M_MOV(REG_SP, REG_ITMP1);
-                       M_AADD_IMM(5 * 4, REG_ITMP1);
-                       M_AST(REG_ITMP1, REG_SP, 1 * 4);
-                       M_ALD(REG_ITMP1, REG_SP, (5 + cd->stackframesize) * 4);
-                       M_AST(REG_ITMP1, REG_SP, 2 * 4);
-                       M_AST(REG_ITMP2_XPC, REG_SP, 3 * 4);
-
-                       M_CALL(REG_ITMP3);
-
-                       M_ALD(REG_ITMP2_XPC, REG_SP, 3 * 4);
-                       M_AADD_IMM(5 * 4, REG_SP);
-
-                       M_MOV_IMM(asm_handle_exception, REG_ITMP3);
-                       M_JMP(REG_ITMP3);
-               }
-               else {
-                       M_JMP_IMM((cd->mcodebase + targetdisp) -
-                                         (cd->mcodeptr + PATCHER_CALL_SIZE));
-               }
+       if (INSTRUCTION_MUST_CHECK(iptr)) {
+               M_TEST(REG_RESULT);
+               M_BNE(6);
+               M_ALD_MEM(REG_RESULT, TRAP_CHECK_EXCEPTION);
        }
 }
 
 
-/* emit_patcher_stubs **********************************************************
+/* emit_trap_compiler **********************************************************
 
-   Generates the code for the patcher stubs.
+   Emit a trap instruction which calls the JIT compiler.
 
 *******************************************************************************/
 
-void emit_patcher_stubs(jitdata *jd)
+void emit_trap_compiler(codegendata *cd)
 {
-       codegendata *cd;
-       patchref    *pref;
-       u8           mcode;
-       u1          *savedmcodeptr;
-       u1          *tmpmcodeptr;
-       s4           targetdisp;
-       s4           disp;
-
-       /* get required compiler data */
-
-       cd = jd->cd;
-
-       /* generate code patching stub call code */
-
-       targetdisp = 0;
-
-       for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
-               /* check code segment size */
-
-               MCODECHECK(512);
-
-               /* Get machine code which is patched back in later. A
-                  `call rel32' is 5 bytes long. */
-
-               savedmcodeptr = cd->mcodebase + pref->branchpos;
-               mcode = *((u8 *) savedmcodeptr);
-
-               /* patch in `call rel32' to call the following code */
-
-               tmpmcodeptr  = cd->mcodeptr;    /* save current mcodeptr              */
-               cd->mcodeptr = savedmcodeptr;   /* set mcodeptr to patch position     */
-
-               M_CALL_IMM(tmpmcodeptr - (savedmcodeptr + PATCHER_CALL_SIZE));
-
-               cd->mcodeptr = tmpmcodeptr;     /* restore the current mcodeptr       */
-
-               /* save REG_ITMP3 */
-
-               M_PUSH(REG_ITMP3);
-
-               /* move pointer to java_objectheader onto stack */
-
-#if defined(ENABLE_THREADS)
-               (void) dseg_add_unique_address(cd, NULL);                  /* flcword */
-               (void) dseg_add_unique_address(cd, lock_get_initial_lock_word());
-               disp = dseg_add_unique_address(cd, NULL);                  /* vftbl   */
-
-               M_MOV_IMM(0, REG_ITMP3);
-               dseg_adddata(cd);
-               M_AADD_IMM(disp, REG_ITMP3);
-               M_PUSH(REG_ITMP3);
-#else
-               M_PUSH_IMM(0);
-#endif
-
-               /* move machine code bytes and classinfo pointer into registers */
-
-               M_PUSH_IMM(mcode >> 32);
-               M_PUSH_IMM(mcode);
-               M_PUSH_IMM(pref->ref);
-               M_PUSH_IMM(pref->patcher);
-
-               if (targetdisp == 0) {
-                       targetdisp = cd->mcodeptr - cd->mcodebase;
-
-                       M_MOV_IMM(asm_patcher_wrapper, REG_ITMP3);
-                       M_JMP(REG_ITMP3);
-               }
-               else {
-                       M_JMP_IMM((cd->mcodebase + targetdisp) -
-                                         (cd->mcodeptr + PATCHER_CALL_SIZE));
-               }
-       }
+       M_ALD_MEM(REG_METHODPTR, TRAP_COMPILER);
 }
 
+/* emit_trap_countdown *********************************************************
 
-/* emit_replacement_stubs ******************************************************
+   Emit a countdown trap.
 
-   Generates the code for the replacement stubs.
+   counter....absolute address of the counter variable
 
 *******************************************************************************/
 
-#if defined(ENABLE_REPLACEMENT)
-void emit_replacement_stubs(jitdata *jd)
+void emit_trap_countdown(codegendata *cd, s4 *counter)
 {
-       codegendata *cd;
-       codeinfo    *code;
-       rplpoint    *rplp;
-       s4           disp;
-       s4           i;
-       s4           branchmpc;
-       s4           outcode;
-
-       /* get required compiler data */
-
-       cd   = jd->cd;
-       code = jd->code;
-
-       rplp = code->rplpoints;
-
-       /* store beginning of replacement stubs */
-
-       code->replacementstubs = (u1*) (cd->mcodeptr - cd->mcodebase);
-
-       for (i = 0; i < code->rplpointcount; ++i, ++rplp) {
-               /* do not generate stubs for non-trappable points */
-
-               if (rplp->flags & RPLPOINT_FLAG_NOTRAP)
-                       continue;
-
-               /* check code segment size */
-
-               MCODECHECK(512);
-
-               /* note start of stub code */
-
-               outcode = (s4) (cd->mcodeptr - cd->mcodebase);
+       M_ISUB_IMM_MEMABS(1, (s4) counter);
+       M_BNS(6);
+       M_ALD_MEM(REG_METHODPTR, TRAP_COUNTDOWN);
+}
 
-               /* push address of `rplpoint` struct */
-                       
-               M_PUSH_IMM(rplp);
+/* emit_trap *******************************************************************
 
-               /* jump to replacement function */
+   Emit a trap instruction and return the original machine code.
 
-               M_PUSH_IMM(asm_replacement_out);
-               M_RET;
+*******************************************************************************/
 
-               /* add jump reference for COUNTDOWN points */
+uint32_t emit_trap(codegendata *cd)
+{
+       uint16_t mcode;
 
-               if (rplp->flags & RPLPOINT_FLAG_COUNTDOWN) {
+       /* Get machine code which is patched back in later. The
+          trap is 2 bytes long. */
 
-                       branchmpc = (s4)rplp->pc + (7 + 6);
+       mcode = *((uint16_t *) cd->mcodeptr);
 
-                       md_codegen_patch_branch(cd, branchmpc, (s4) outcode);
-               }
+#if 0
+       /* XXX this breaks GDB, so we disable it for now */
+       *(cd->mcodeptr++) = 0xcc;
+       M_INT3;
+#else
+       M_UD2;
+#endif
 
-               assert(((cd->mcodeptr - cd->mcodebase) - outcode) == REPLACEMENT_STUB_SIZE);
-       }
+       return (uint32_t) mcode;
 }
-#endif /* defined(ENABLE_REPLACEMENT) */
-       
+
 
 /* emit_verbosecall_enter ******************************************************
 
@@ -609,20 +569,23 @@ void emit_replacement_stubs(jitdata *jd)
 void emit_verbosecall_enter(jitdata *jd)
 {
        methodinfo   *m;
+       codeinfo     *code;
        codegendata  *cd;
        registerdata *rd;
        methoddesc   *md;
-       s4            disp;
-       s4            i, t;
+       int32_t       stackframesize;
+       int           i;
+       int           align_off;             /* offset for alignment compensation */
 
        if (!JITDATA_HAS_FLAG_VERBOSECALL(jd))
                return;
 
        /* get required compiler data */
 
-       m  = jd->m;
-       cd = jd->cd;
-       rd = jd->rd;
+       m    = jd->m;
+       code = jd->code;
+       cd   = jd->cd;
+       rd   = jd->rd;
 
        md = m->parseddesc;
 
@@ -630,63 +593,40 @@ void emit_verbosecall_enter(jitdata *jd)
 
        M_NOP;
 
-       /* methodinfo* + arguments + return address */
+       /* keep stack 16-byte aligned */
 
-       disp = TRACE_ARGS_NUM * 8 + 4 + INT_TMP_CNT * 4 +
-               cd->stackframesize * 4 + 4;
+       stackframesize = 2 + TMP_CNT;
+       ALIGN_2(stackframesize);
 
-       M_ASUB_IMM(TRACE_ARGS_NUM * 8 + 4 + INT_TMP_CNT * 4, REG_SP);
+       M_ASUB_IMM(stackframesize * 8, REG_SP);
 
        /* save temporary registers for leaf methods */
 
-       for (i = 0; i < INT_TMP_CNT; i++)
-               M_IST(rd->tmpintregs[i], REG_SP, TRACE_ARGS_NUM * 8 + 4 + i * 4);
-
-       for (i = 0; i < md->paramcount && i < TRACE_ARGS_NUM; i++) {
-               t = md->paramtypes[i].type;
-
-               if (IS_INT_LNG_TYPE(t)) {
-                       if (IS_2_WORD_TYPE(t)) {
-                               M_LLD(REG_ITMP12_PACKED, REG_SP, disp);
-                               M_LST(REG_ITMP12_PACKED, REG_SP, i * 8);
-                       }
-                       else if (IS_ADR_TYPE(t)) {
-                               M_ALD(REG_ITMP1, REG_SP, disp);
-                               M_AST(REG_ITMP1, REG_SP, i * 8);
-                               M_IST_IMM(0, REG_SP, i * 8 + 4);
-                       }
-                       else {
-                               M_ILD(EAX, REG_SP, disp);
-                               emit_cltd(cd);
-                               M_LST(EAX_EDX_PACKED, REG_SP, i * 8);
-                       }
-               }
-               else {
-                       if (IS_2_WORD_TYPE(t)) {
-                               M_DLD(REG_NULL, REG_SP, disp);
-                               M_DST(REG_NULL, REG_SP, i * 8);
-                       }
-                       else {
-                               M_FLD(REG_NULL, REG_SP, disp);
-                               M_FST(REG_NULL, REG_SP, i * 8);
-                               M_IST_IMM(0, REG_SP, i * 8 + 4);
-                       }
-               }
-
-               disp += (IS_2_WORD_TYPE(t)) ? 8 : 4;
+       if (code_is_leafmethod(code)) {
+               for (i = 0; i < INT_TMP_CNT; i++)
+                       M_IST(rd->tmpintregs[i], REG_SP, (2 + i) * 8);
        }
-       
-       M_AST_IMM(m, REG_SP, TRACE_ARGS_NUM * 8);
 
-       M_MOV_IMM(builtin_verbosecall_enter, REG_ITMP1);
+       /* no argument registers to save */
+
+       align_off = cd->stackframesize ? 4 : 0;
+       M_AST_IMM(m, REG_SP, 0 * 4);
+       M_AST_IMM(0, REG_SP, 1 * 4);
+       M_AST(REG_SP, REG_SP, 2 * 4);
+       M_IADD_IMM_MEMBASE(stackframesize * 8 + cd->stackframesize * 8 + 4 + align_off, REG_SP, 2 * 4);
+       M_MOV_IMM(trace_java_call_enter, REG_ITMP1);
        M_CALL(REG_ITMP1);
 
+       /* no argument registers to restore */
+
        /* restore temporary registers for leaf methods */
 
-       for (i = 0; i < INT_TMP_CNT; i++)
-               M_ILD(rd->tmpintregs[i], REG_SP, TRACE_ARGS_NUM * 8 + 4 + i * 4);
+       if (code_is_leafmethod(code)) {
+               for (i = 0; i < INT_TMP_CNT; i++)
+                       M_ILD(rd->tmpintregs[i], REG_SP, (2 + i) * 8);
+       }
 
-       M_AADD_IMM(TRACE_ARGS_NUM * 8 + 4 + INT_TMP_CNT * 4, REG_SP);
+       M_AADD_IMM(stackframesize * 8, REG_SP);
 
        /* mark trace code */
 
@@ -699,8 +639,6 @@ void emit_verbosecall_enter(jitdata *jd)
 
    Generates the code for the call trace.
 
-   void builtin_verbosecall_exit(s8 l, double d, float f, methodinfo *m);
-
 *******************************************************************************/
 
 #if !defined(NDEBUG)
@@ -709,6 +647,7 @@ void emit_verbosecall_exit(jitdata *jd)
        methodinfo   *m;
        codegendata  *cd;
        registerdata *rd;
+       methoddesc   *md;
 
        if (!JITDATA_HAS_FLAG_VERBOSECALL(jd))
                return;
@@ -719,25 +658,53 @@ void emit_verbosecall_exit(jitdata *jd)
        cd = jd->cd;
        rd = jd->rd;
 
+       md = m->parseddesc;
+
        /* mark trace code */
 
        M_NOP;
 
-       M_ASUB_IMM(8 + 8 + 4 + 4 + 8, REG_SP);  /* +8: keep stack 16-byte aligned */
-
-       M_LST(REG_RESULT_PACKED, REG_SP, 0 * 8);
-
-       M_DSTNP(REG_NULL, REG_SP, 1 * 8);
-       M_FSTNP(REG_NULL, REG_SP, 2 * 8);
-
-       M_AST_IMM(m, REG_SP, 2 * 8 + 1 * 4);
+       /* keep stack 16-byte aligned */
+
+       M_ASUB_IMM(4 + 4 + 8, REG_SP);
+
+       /* save return value */
+
+       switch (md->returntype.type) {
+       case TYPE_ADR:
+       case TYPE_INT:
+               M_IST(REG_RESULT, REG_SP, 2 * 4);
+               break;
+       case TYPE_LNG:
+               M_LST(REG_RESULT_PACKED, REG_SP, 2 * 4);
+               break;
+       case TYPE_FLT:
+               M_FSTNP(REG_NULL, REG_SP, 2 * 4);
+               break;
+       case TYPE_DBL:
+               M_DSTNP(REG_NULL, REG_SP, 2 * 4);
+               break;
+       }
 
-       M_MOV_IMM(builtin_verbosecall_exit, REG_ITMP1);
+       M_AST_IMM(m, REG_SP, 0 * 4);
+       M_AST(REG_SP, REG_SP, 1 * 4);
+       M_IADD_IMM_MEMBASE(2 * 4, REG_SP, 1 * 4);
+       M_MOV_IMM(trace_java_call_exit, REG_ITMP1);
        M_CALL(REG_ITMP1);
 
-       M_LLD(REG_RESULT_PACKED, REG_SP, 0 * 4);
+       /* restore return value */
 
-       M_AADD_IMM(8 + 8 + 4 + 4 + 8, REG_SP);
+       switch (md->returntype.type) {
+       case TYPE_ADR:
+       case TYPE_INT:
+               M_ILD(REG_RESULT, REG_SP, 2 * 4);
+               break;
+       case TYPE_LNG:
+               M_LLD(REG_RESULT_PACKED, REG_SP, 2 * 4);
+               break;
+       }
+
+       M_AADD_IMM(4 + 4 + 8, REG_SP);
 
        /* mark trace code */
 
@@ -960,6 +927,15 @@ void emit_movb_imm_membase(codegendata *cd, s4 imm, s4 basereg, s4 disp)
 }
 
 
+void emit_movsbl_reg_reg(codegendata *cd, s4 a, s4 b)
+{
+       assert(a < 4);                     /* Can only operate on al, bl, cl, dl. */
+       *(cd->mcodeptr++) = 0x0f;
+       *(cd->mcodeptr++) = 0xbe;
+       emit_reg((b),(a));
+}
+
+
 void emit_movsbl_memindex_reg(codegendata *cd, s4 disp, s4 basereg, s4 indexreg, s4 scale, s4 reg)
 {
        COUNT(count_mov_mem_reg);
@@ -986,6 +962,15 @@ void emit_movswl_memindex_reg(codegendata *cd, s4 disp, s4 basereg, s4 indexreg,
 }
 
 
+void emit_movzbl_reg_reg(codegendata *cd, s4 a, s4 b)
+{
+       assert(a < 4);                     /* Can only operate on al, bl, cl, dl. */
+       *(cd->mcodeptr++) = 0x0f;
+       *(cd->mcodeptr++) = 0xb6;
+       emit_reg((b),(a));
+}
+
+
 void emit_movzwl_reg_reg(codegendata *cd, s4 a, s4 b)
 {
        *(cd->mcodeptr++) = 0x0f;
@@ -1128,12 +1113,6 @@ void emit_dec_mem(codegendata *cd, s4 mem)
 }
 
 
-void emit_cltd(codegendata *cd)
-{
-       *(cd->mcodeptr++) = 0x99;
-}
-
-
 void emit_imul_reg_reg(codegendata *cd, s4 reg, s4 dreg)
 {
        *(cd->mcodeptr++) = 0x0f;
@@ -1213,12 +1192,6 @@ void emit_idiv_reg(codegendata *cd, s4 reg)
 }
 
 
-void emit_ret(codegendata *cd)
-{
-       *(cd->mcodeptr++) = 0xc3;
-}
-
-
 
 /*
  * shift ops
@@ -1374,12 +1347,6 @@ void emit_push_reg(codegendata *cd, s4 reg)
 }
 
 
-void emit_nop(codegendata *cd)
-{
-       *(cd->mcodeptr++) = 0x90;
-}
-
-
 void emit_lock(codegendata *cd)
 {
        *(cd->mcodeptr++) = 0xf0;
@@ -1909,6 +1876,14 @@ void emit_fincstp(codegendata *cd)
        *(cd->mcodeptr++) = 0xf7;
 }
 
+#if defined(ENABLE_ESCAPE_CHECK)
+void emit_escape_check(codegendata *cd, s4 reg) {
+       M_PUSH(reg);
+       M_MOV_IMM(asm_escape_check, REG_ITMP3);
+       M_CALL(REG_ITMP3);
+       M_IADD_IMM(4, REG_SP);
+}
+#endif
 
 /*
  * These are local overrides for various environment variables in Emacs.