* src/vm/jit/s390/codegen.c: Fixed build.
[cacao.git] / src / vm / jit / s390 / emit.c
index 6f92167f39be72b61fd8ab24d70b4fe887ca69f8..f01ddf983097945cea769b638bdad20223c302ae 100644 (file)
@@ -1,9 +1,7 @@
 /* src/vm/jit/s390/emit.c - s390 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, 2010
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: emit.c 8240 2007-07-29 20:36:47Z pm $
-
 */
 
-
 #include "config.h"
 
 #include <assert.h>
-
-#include "vm/types.h"
-
-#include "md-abi.h"
+#include <stdint.h>
 
 #include "vm/jit/s390/codegen.h"
 #include "vm/jit/s390/emit.h"
+#include "vm/jit/s390/md-abi.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "mm/memory.hpp"
 
-#include "vm/builtin.h"
+#include "threads/lock.hpp"
+
+#include "vm/jit/builtin.hpp"
+#include "vm/global.h"
+#include "vm/types.h"
+#include "vm/options.h"
+
+#include "vm/jit/abi.h"
 #include "vm/jit/abi-asm.h"
 #include "vm/jit/asmpart.h"
-#include "vm/jit/codegen-common.h"
-#include "vm/jit/emit-common.h"
-#include "vm/jit/jit.h"
-#include "vm/jit/replace.h"
-#include "vm/jit/abi.h"
-#include "vm/global.h"
-#include "mm/memory.h"
-#include "vm/exceptions.h"
+#include "vm/jit/codegen-common.hpp"
+#include "vm/jit/emit-common.hpp"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/patcher-common.hpp"
+#include "vm/jit/replace.hpp"
+#include "vm/jit/trace.hpp"
+#include "vm/jit/trap.hpp"
 
-#define __PORTED__
 
 /* emit_load *******************************************************************
 
@@ -62,7 +58,7 @@
 
 *******************************************************************************/
 
-__PORTED__ s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
+s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
 {
        codegendata *cd;
        s4           disp;
@@ -108,7 +104,7 @@ __PORTED__ s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg
     
 *******************************************************************************/
 
-__PORTED__ inline void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
+void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 {
        codegendata *cd;
 
@@ -141,7 +137,7 @@ __PORTED__ inline void emit_store(jitdata *jd, instruction *iptr, varinfo *dst,
 
 *******************************************************************************/
 
-__PORTED__ void emit_copy(jitdata *jd, instruction *iptr)
+void emit_copy(jitdata *jd, instruction *iptr)
 {
        codegendata *cd;
        varinfo     *src;
@@ -165,279 +161,281 @@ __PORTED__ void emit_copy(jitdata *jd, instruction *iptr)
                        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. */
-
-               if (IS_INMEMORY(src->flags)) {
-                       if (IS_FLT_DBL_TYPE(dst->type)) {
-                               d = codegen_reg_of_var(iptr->opc, dst, REG_FTMP1);
+               if (IS_INMEMORY(src->flags) && IS_INMEMORY(dst->flags)) {
+                       if (IS_2_WORD_TYPE(src->type)) {
+                               N_MVC(dst->vv.regoff, 8, REG_SP, src->vv.regoff, REG_SP);
                        } else {
-                               if (IS_2_WORD_TYPE(dst->type)) {
-                                       d = codegen_reg_of_var(iptr->opc, dst, REG_ITMP12_PACKED);
+                               N_MVC(dst->vv.regoff, 4, REG_SP, src->vv.regoff, REG_SP);
+                       }
+               } else {
+
+                       /* 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. */
+
+                       if (IS_INMEMORY(src->flags)) {
+                               if (IS_FLT_DBL_TYPE(dst->type)) {
+                                       d = codegen_reg_of_var(iptr->opc, dst, REG_FTMP1);
                                } else {
-                                       d = codegen_reg_of_var(iptr->opc, dst, REG_ITMP1);
+                                       if (IS_2_WORD_TYPE(dst->type)) {
+                                               d = codegen_reg_of_var(iptr->opc, dst, REG_ITMP12_PACKED);
+                                       } else {
+                                               d = codegen_reg_of_var(iptr->opc, dst, REG_ITMP1);
+                                       }
                                }
+                               s1 = emit_load(jd, iptr, src, d);
                        }
-                       s1 = emit_load(jd, iptr, src, d);
-               }
-               else {
-                       if (IS_FLT_DBL_TYPE(src->type)) {
-                               s1 = emit_load(jd, iptr, src, REG_FTMP1);
-                       } else {
-                               if (IS_2_WORD_TYPE(src->type)) {
-                                       s1 = emit_load(jd, iptr, src, REG_ITMP12_PACKED);
+                       else {
+                               if (IS_FLT_DBL_TYPE(src->type)) {
+                                       s1 = emit_load(jd, iptr, src, REG_FTMP1);
                                } else {
-                                       s1 = emit_load(jd, iptr, src, REG_ITMP1);
+                                       if (IS_2_WORD_TYPE(src->type)) {
+                                               s1 = emit_load(jd, iptr, src, REG_ITMP12_PACKED);
+                                       } else {
+                                               s1 = emit_load(jd, iptr, src, REG_ITMP1);
+                                       }
                                }
+                               d = codegen_reg_of_var(iptr->opc, dst, s1);
                        }
-                       d = codegen_reg_of_var(iptr->opc, dst, s1);
-               }
 
-               if (s1 != d) {
-                       if (IS_FLT_DBL_TYPE(src->type)) {
-                               M_FMOV(s1, d);
-                       } else {
-                               if (IS_2_WORD_TYPE(src->type)) {
-                                       M_LNGMOVE(s1, d);
+                       if (s1 != d) {
+                               if (IS_FLT_DBL_TYPE(src->type)) {
+                                       M_FMOV(s1, d);
                                } else {
-                                       M_MOV(s1, d);
+                                       if (IS_2_WORD_TYPE(src->type)) {
+                                               M_LNGMOVE(s1, d);
+                                       } else {
+                                               M_MOV(s1, d);
+                                       }
                                }
                        }
-               }
 
-               emit_store(jd, iptr, dst, d);
+                       emit_store(jd, iptr, dst, d);
+               }
        }
 }
 
 
-/* emit_patcher_stubs **********************************************************
-
-   Generates the code for the patcher stubs.
-
-*******************************************************************************/
-
-__PORTED__ void emit_patcher_stubs(jitdata *jd)
+/**
+ * Emits code updating the condition register by comparing one integer
+ * register to an immediate integer value.
+ */
+void emit_icmp_imm(codegendata* cd, int reg, int32_t value)
 {
-       
-       codegendata *cd;
-       patchref    *pref;
-       u4           mcode;
-       u1          *savedmcodeptr;
-       u1          *tmpmcodeptr;
-       s4           targetdisp;
-       s4           disp;
-       u1          *ref;
+       int32_t 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(100);
-
-               /* Get machine code which is patched back in later. The
-                  call is 1 instruction word long. */
-
-               tmpmcodeptr = (u1 *) (cd->mcodebase + pref->branchpos);
-
-               mcode = *((u4 *) tmpmcodeptr);
-
-               /* Patch in the call to call the following code (done at
-                  compile time). */
-
-               savedmcodeptr = cd->mcodeptr;   /* save current mcodeptr              */
-               cd->mcodeptr  = tmpmcodeptr;    /* set mcodeptr to patch position     */
-
-               disp = (savedmcodeptr) - (tmpmcodeptr);
-
-               if (! N_VALID_BRANCH(disp)) {
-                       /* Displacement overflow */
-
-                       /* If LONGBRANCHES is not set, the flag and the error flag */
-                       
-                       if (! CODEGENDATA_HAS_FLAG_LONGBRANCHES(cd)) {
-                               cd->flags |= (CODEGENDATA_FLAG_ERROR |
-                                       CODEGENDATA_FLAG_LONGBRANCHES);
-                       }
-
-                       /* If error flag is set, do nothing. The method has to be recompiled. */
-
-                       if (CODEGENDATA_HAS_FLAG_LONGBRANCHES(cd) && CODEGENDATA_HAS_FLAG_ERROR(cd)) {
-                               return;
-                       }
+       if (N_VALID_IMM(value)) {
+               M_ICMP_IMM(reg, value);
+       } else {
+               disp = dseg_add_s4(cd, value);
+               if (N_VALID_DSEG_DISP(disp)) {
+                       N_C(reg, N_DSEG_DISP(disp), RN, REG_PV);
+               } else {
+                       assert(reg != REG_ITMP2);
+                       ICONST(REG_ITMP2, disp);
+                       N_C(reg, -N_PV_OFFSET, REG_ITMP2, REG_PV);
                }
+       }
+}
 
-               if (CODEGENDATA_HAS_FLAG_LONGBRANCHES(cd)) {    
-
-                       /* Generating long branches */
-
-                       disp = dseg_add_s4(cd, savedmcodeptr - cd->mcodebase - N_PV_OFFSET);
-       
-                       M_ILD_DSEG(REG_ITMP3, disp);
-                       M_AADD(REG_PV, REG_ITMP3);
 
-                       /* Do the branch at the end of NOP sequence.
-                        * This way the patch position is at a *fixed* offset 
-                        * (PATCHER_LONGBRANCHES_NOPS_SKIP) of the return address.
-                        */
+/* emit_trap *******************************************************************
 
-                       cd->mcodeptr = tmpmcodeptr + PATCHER_LONGBRANCHES_NOPS_SKIP - SZ_BASR;
-                       M_JMP(REG_ITMP3, REG_ITMP3);
-               } else {
+   Emit a trap instruction and return the original machine code.
 
-                       /* Generating short branches */
-
-                       M_BSR(REG_ITMP3, disp);
-               }
+*******************************************************************************/
 
-               cd->mcodeptr = savedmcodeptr;   /* restore the current mcodeptr       */
+uint32_t emit_trap(codegendata *cd)
+{
+       uint32_t mcode;
 
-               /* create stack frame */
+       /* Get machine code which is patched back in later. The
+          trap is 2 bytes long. */
 
-               M_ASUB_IMM(6 * 4, REG_SP);
+       mcode = *((u2 *) cd->mcodeptr);
 
-               /* move return address onto stack */
+       M_ILL(TRAP_PATCHER);
 
-               M_AST(REG_ITMP3, REG_SP, 5 * 4);
+       return mcode;
+}
 
-               /* move pointer to java_objectheader onto stack */
 
+/**
+ * Generates synchronization code to enter a monitor.
+ */
 #if defined(ENABLE_THREADS)
-               /* create a virtual java_objectheader */
+void emit_monitor_enter(jitdata* jd, int32_t syncslot_offset)
+{
+       int32_t p;
+       int32_t disp;
 
-               (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   */
+       // Get required compiler data.
+       methodinfo*  m  = jd->m;
+       codegendata* cd = jd->cd;
 
-               M_LDA_DSEG(REG_ITMP3, disp);
-               M_AST(REG_ITMP3, REG_SP, 4 * 4);
-#else
-               /* nothing to do */
-#endif
+#if !defined(NDEBUG)
+       if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) {
+               M_ASUB_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
 
-               /* move machine code onto stack */
+               for (p = 0; p < INT_ARG_CNT; p++)
+                       M_IST(abi_registers_integer_argument[p], REG_SP, p * 8);
 
-               disp = dseg_add_s4(cd, mcode);
-               M_ILD_DSEG(REG_ITMP3, disp);
-               M_IST(REG_ITMP3, REG_SP, 3 * 4);
+               for (p = 0; p < FLT_ARG_CNT; p++)
+                       M_DST(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
 
-               /* move class/method/field reference onto stack */
+               syncslot_offset += (INT_ARG_CNT + FLT_ARG_CNT) * 8;
+       }
+#endif
 
-               disp = dseg_add_address(cd, pref->ref);
-               M_ALD_DSEG(REG_ITMP3, disp);
-               M_AST(REG_ITMP3, REG_SP, 2 * 4);
+       /* decide which monitor enter function to call */
 
-               /* move data segment displacement onto stack */
+       if (m->flags & ACC_STATIC) {
+               disp = dseg_add_address(cd, &m->clazz->object.header);
+               M_ALD_DSEG(REG_A0, disp);
+       }
+       else {
+               M_TEST(REG_A0);
+               M_BNE(SZ_BRC + SZ_ILL);
+               M_ILL(TRAP_NullPointerException);
+       }
 
-               disp = dseg_add_s4(cd, pref->disp);
-               M_ILD_DSEG(REG_ITMP3, disp);
-               M_IST(REG_ITMP3, REG_SP, 1 * 4);
+       disp = dseg_add_functionptr(cd, LOCK_monitor_enter);
+       M_ALD_DSEG(REG_ITMP2, disp);
 
-               /* move patcher function pointer onto stack */
+       M_AST(REG_A0, REG_SP, syncslot_offset);
 
-               disp = dseg_add_functionptr(cd, pref->patcher);
-               M_ALD_DSEG(REG_ITMP3, disp);
-               M_AST(REG_ITMP3, REG_SP, 0 * 4);
+       M_ASUB_IMM(96, REG_SP); 
+       M_CALL(REG_ITMP2);
+       M_AADD_IMM(96, REG_SP); 
 
-               if (targetdisp == 0) {
-                       targetdisp = (cd->mcodeptr) - (cd->mcodebase);
+#if !defined(NDEBUG)
+       if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) {
+               for (p = 0; p < INT_ARG_CNT; p++)
+                       M_ILD(abi_registers_integer_argument[p], REG_SP, p * 8);
 
-                       disp = dseg_add_functionptr(cd, asm_patcher_wrapper);
-                       M_ALD_DSEG(REG_ITMP3, disp);
-                       M_JMP(RN, REG_ITMP3);
-               }
-               else {
-                       disp = ((cd->mcodebase) + targetdisp) -
-                               (( cd->mcodeptr) );
+               for (p = 0; p < FLT_ARG_CNT; p++)
+                       M_DLD(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
 
-                       emit_branch(cd, disp, BRANCH_UNCONDITIONAL, RN, 0);
-               }
+               M_AADD_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
        }
+#endif
 }
+#endif
 
 
-/* emit_replacement_stubs ******************************************************
-
-   Generates the code for the replacement stubs.
-
-*******************************************************************************/
-#if defined(ENABLE_REPLACEMENT)
-void emit_replacement_stubs(jitdata *jd)
+/**
+ * Generates synchronization code to leave a monitor.
+ */
+#if defined(ENABLE_THREADS)
+void emit_monitor_exit(jitdata* jd, int32_t syncslot_offset)
 {
-       codegendata *cd;
-       codeinfo    *code;
-       rplpoint    *rplp;
-       s4           disp;
-       s4           i, remain;
-       u1          *savedmcodeptr;
-
-       /* 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 */
+       int32_t disp;
+
+       // Get required compiler data.
+       methodinfo*  m  = jd->m;
+       codegendata* cd = jd->cd;
+
+       /* we need to save the proper return value */
+
+       methoddesc* md = m->parseddesc;
+
+       switch (md->returntype.type) {
+       case TYPE_LNG:
+               M_IST(REG_RESULT2, REG_SP, syncslot_offset + 8 + 4);
+               /* fall through */
+       case TYPE_INT:
+       case TYPE_ADR:
+               M_IST(REG_RESULT , REG_SP, syncslot_offset + 8);
+               break;
+       case TYPE_FLT:
+               M_FST(REG_FRESULT, REG_SP, syncslot_offset + 8);
+               break;
+       case TYPE_DBL:
+               M_DST(REG_FRESULT, REG_SP, syncslot_offset + 8);
+               break;
+       }
 
-               if (rplp->flags & RPLPOINT_FLAG_NOTRAP)
-                       continue;
+       M_ALD(REG_A0, REG_SP, syncslot_offset);
 
-               /* check code segment size */
+       disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
+       M_ALD_DSEG(REG_ITMP2, disp);
 
-               MCODECHECK(512);
+       M_ASUB_IMM(96, REG_SP);
+       M_CALL(REG_ITMP2);
+       M_AADD_IMM(96, REG_SP);
 
-#if !defined(NDEBUG)
-               savedmcodeptr = cd->mcodeptr;
+       /* and now restore the proper return value */
+
+       switch (md->returntype.type) {
+       case TYPE_LNG:
+               M_ILD(REG_RESULT2, REG_SP, syncslot_offset + 8 + 4);
+               /* fall through */
+       case TYPE_INT:
+       case TYPE_ADR:
+               M_ILD(REG_RESULT , REG_SP, syncslot_offset + 8);
+               break;
+       case TYPE_FLT:
+               M_FLD(REG_FRESULT, REG_SP, syncslot_offset + 8);
+               break;
+       case TYPE_DBL:
+               M_DLD(REG_FRESULT, REG_SP, syncslot_offset + 8);
+               break;
+       }
+}
 #endif
 
-               /* create stack frame - 8-byte aligned */
-
-               M_ASUB_IMM(REG_SP, 2 * 4);
 
-               /* push address of `rplpoint` struct, will be used in asm_replacement_out */
-
-               disp = dseg_add_address(cd, rplp);
-               M_ALD_DSEG(REG_ITMP3, disp);
-               M_AST(REG_ITMP3, REG_SP, 0 * 4);
+/**
+ * Emit profiling code for method frequency counting.
+ */
+#if defined(ENABLE_PROFILING)
+void emit_profile_method(codegendata* cd, codeinfo* code)
+{
+       M_ALD_DSEG(REG_ITMP1, CodeinfoPointer);
+       ICONST(REG_ITMP2, 1);
+       N_AL(REG_ITMP2, OFFSET(codeinfo, frequency), RN, REG_ITMP1);
+       M_IST(REG_ITMP2, REG_ITMP1, OFFSET(codeinfo, frequency));
+}
+#endif
 
-               /* jump to replacement function */
 
-               disp = dseg_add_functionptr(cd, asm_replacement_out);
-               M_ALD_DSEG(REG_ITMP3, disp);
-               M_JMP(RN, REG_ITMP3);
+/**
+ * Emit profiling code for basicblock frequency counting.
+ */
+#if defined(ENABLE_PROFILING)
+void emit_profile_basicblock(codegendata* cd, codeinfo* code, basicblock* bptr)
+{
+       M_ALD_DSEG(REG_ITMP1, CodeinfoPointer);
+       M_ALD(REG_ITMP1, REG_ITMP1, OFFSET(codeinfo, bbfrequency));
+       ICONST(REG_ITMP2, 1);
+       N_AL(REG_ITMP2, bptr->nr * 4, RN, REG_ITMP1);
+       M_IST(REG_ITMP2, REG_ITMP1, bptr->nr * 4);
+}
+#endif
 
-               assert((cd->mcodeptr - savedmcodeptr) <= REPLACEMENT_STUB_SIZE);
 
-               /* pad with NOPs */
+/**
+ * Emit profiling code to start CPU cycle counting.
+ */
+#if defined(ENABLE_PROFILING)
+void emit_profile_cycle_start(codegendata* cd, codeinfo* code)
+{
+       // XXX Not implemented yet!
+}
+#endif
 
-               for (remain = REPLACEMENT_STUB_SIZE - (cd->mcodeptr - savedmcodeptr); remain > 0;) {
-                       if (remain >= 4) {
-                               M_NOP;
-                               remain -= 4;
-                       } else {
-                               M_NOP2;
-                               remain -= 2;
-                       }
-               }
 
-               assert((cd->mcodeptr - savedmcodeptr) == REPLACEMENT_STUB_SIZE);
-       }
+/**
+ * Emit profiling code to stop CPU cycle counting.
+ */
+#if defined(ENABLE_PROFILING)
+void emit_profile_cycle_stop(codegendata* cd, codeinfo* code)
+{
+       // XXX Not implemented yet!
 }
 #endif
 
+
 /* emit_verbosecall_enter ******************************************************
 
    Generates the code for the call trace.
@@ -447,178 +445,157 @@ void emit_replacement_stubs(jitdata *jd)
 #if !defined(NDEBUG)
 void emit_verbosecall_enter(jitdata *jd)
 {
-       
        methodinfo   *m;
+       codeinfo     *code;
        codegendata  *cd;
        methoddesc   *md;
-       s4            i, j, k;
-       s4            stackframesize, off, foff, aoff, doff, t, iargctr, fargctr, disp;
+       s4            stackframesize;
+       s4            i, off, disp, s;
 
-       /* get required compiler data */
-
-       m  = jd->m;
-       cd = jd->cd;
+       m    = jd->m;
+       code = jd->code;
+       cd   = jd->cd;
 
-       md = m->parseddesc;
+       md   = m->parseddesc;
 
        /* mark trace code */
 
        M_NOP;
 
-       stackframesize = 
-               (6 * 8) + /* s8 on stack parameters x 6 */
-               (1 * 4) + /* methodinfo on stack parameter */
-               (ARG_CNT * 8) +
-               (TMP_CNT * 8) 
-               ;
+       /* allocate stack frame */
 
-       M_ASUB_IMM(stackframesize, REG_SP); /* allocate stackframe */
+       stackframesize = 96 + (md->paramcount * 8);
 
-       /* save argument registers */
+       /* for leaf methods we need to store unused argument and temporary registers */
 
-       off = (6 * 8) + (1 * 4);
-
-       for (i = 0; i < INT_ARG_CNT; i++, off += 8)
-               M_IST(abi_registers_integer_argument[i], REG_SP, off);
+       if (code_is_leafmethod(code)) {
+               stackframesize += (ARG_CNT + TMP_CNT) * 8;
+       }
 
-       for (i = 0; i < FLT_ARG_CNT; i++, off += 8)
-               M_DST(abi_registers_float_argument[i], REG_SP, off);
+       /* allocate stack frame */
+
+       M_ASUB_IMM(stackframesize, REG_SP);
+
+       /* store argument registers in array */
+
+       off = 96;
+
+       for (i = 0; i < md->paramcount; i++) {
+               if (! md->params[i].inmemory) {
+                       s = md->params[i].regoff;
+                       switch (md->paramtypes[i].type) {
+                               case TYPE_INT:
+                               case TYPE_ADR:
+                                       M_IST(s, REG_SP, off);
+                                       break;
+                               case TYPE_LNG:
+                                       M_LST(s, REG_SP, off);
+                                       break;
+                               case TYPE_FLT:
+                                       M_FST(s, REG_SP, off);
+                                       break;
+                               case TYPE_DBL:
+                                       M_DST(s, REG_SP, off);
+                                       break;
+                       }
+               }
+               off += 8;
+       }
 
+       /* save unused (currently all) argument registers for leaf methods */
        /* save temporary registers for leaf methods */
 
-       if (jd->isleafmethod) {
-               for (i = 0; i < INT_TMP_CNT; i++, off += 8)
-                       M_LST(abi_registers_integer_temporary[i], REG_SP, off);
+       if (code_is_leafmethod(code)) {
 
-               for (i = 0; i < FLT_TMP_CNT; i++, off += 8)
-                       M_DST(abi_registers_float_temporary[i], REG_SP, off);
-       }
-
-       /* Load arguments to new locations */
+               for (i = 0; i < INT_ARG_CNT; ++i, off += 8) {
+                       M_IST(abi_registers_integer_argument[i], REG_SP, off);
+               }
 
-       /* First move all arguments to stack
-        *
-        * (s8) a7
-        * (s8) a2
-        *   ...
-        * (s8) a1 \ Auxilliary stack frame
-        * (s8) a0 /
-        * ------- <---- SP
-        */
+               for (i = 0; i < FLT_ARG_CNT; ++i, off += 8) {
+                       M_DST(abi_registers_float_argument[i], REG_SP, off);
+               }
 
-       M_ASUB_IMM(2 * 8, REG_SP);
-       
-       /* offset to where first integer arg is saved on stack */
-       off = (2 * 8) + (6 * 8) + (1 * 4); 
-       /* offset to where first float arg is saved on stack */
-       foff = off + (INT_ARG_CNT * 8); 
-       /* offset to where first argument is passed on stack */
-       aoff = (2 * 8) + stackframesize + (cd->stackframesize * 4);
-       /* offset to destination on stack */
-       doff = 0; 
-
-       iargctr = fargctr = 0;
-
-       ICONST(REG_ITMP1, 0);
-
-       for (i = 0; i < md->paramcount && i < 8; i++) {
-               t = md->paramtypes[i].type;
-
-               M_IST(REG_ITMP1, REG_SP, doff);
-               M_IST(REG_ITMP1, REG_SP, doff + 4);
-
-               if (IS_FLT_DBL_TYPE(t)) {
-                       if (fargctr < 2) { /* passed in register */
-                               N_STD(abi_registers_float_argument[fargctr], doff, RN, REG_SP);
-                               fargctr += 1;
-                       } else { /* passed on stack */
-                               if (IS_2_WORD_TYPE(t)) {
-                                       N_MVC(doff, 8, REG_SP, aoff, REG_SP);
-                                       aoff += 8;
-                               } else {
-                                       N_MVC(doff + 4, 4, REG_SP, aoff, REG_SP);
-                                       aoff += 4;
-                               }
-                       }
-               } else {
-                       if (IS_2_WORD_TYPE(t)) {
-                               if (iargctr < 4) { /* passed in 2 registers */
-                                       N_STM(REG_A0 + iargctr, REG_A0 + iargctr + 1, doff, REG_SP);
-                                       iargctr += 2;
-                               } else { /* passed on stack */
-                                       N_MVC(doff, 8, REG_SP, aoff, REG_SP);
-                                       aoff += 8;
-                               }
-                       } else {
-                               if (iargctr < 5) { /* passed in register */
-                                       N_ST(REG_A0 + iargctr, doff + 4, RN, REG_SP);
-                                       iargctr += 1;
-                               } else { /* passed on stack */
-                                       N_MVC(doff + 4, 4, REG_SP, aoff, REG_SP);
-                                       aoff += 4;
-                               }
-                       }
+               for (i = 0; i < INT_TMP_CNT; ++i, off += 8) {
+                       M_IST(abi_registers_integer_temporary[i], REG_SP, off);
                }
 
-               doff += 8;
+               for (i = 0; i < FLT_TMP_CNT; ++i, off += 8) {
+                       M_DST(abi_registers_float_temporary[i], REG_SP, off);
+               }
        }
 
-       /* Now move a0 and a1 to registers
-        *
-        * (s8) a7
-        *   ...
-        * (s8) a2
-        * ------- <- SP
-        * (s8) a0 ==> a0, a1
-        * (s8) a1 ==> a2, a3
-        */
-
-       N_LM(REG_A0, REG_A1, 0, REG_SP);
-       N_LM(REG_A2, REG_A3, 8, REG_SP);
-
-       M_AADD_IMM(2 * 8, REG_SP);
+       /* load arguments for trace_java_call_enter */
 
-       /* Finally load methodinfo argument */
+       /* methodinfo */
 
        disp = dseg_add_address(cd, m);
-       M_ALD_DSEG(REG_ITMP2, disp);    
-       M_AST(REG_ITMP2, REG_SP, 6 * 8);
+       M_ALD_DSEG(REG_A0, disp);       
+       /* pointer to argument registers array */
+       M_LDA(REG_A1, REG_SP, 96);
+       /* pointer to on stack arguments */
+       M_LDA(REG_A2, REG_SP, stackframesize + (cd->stackframesize * 8));
 
-       /* Call builtin_verbosecall_enter */
+       /* call trace_java_call_enter */
 
-       disp = dseg_add_address(cd, builtin_verbosecall_enter);
+       disp = dseg_add_functionptr(cd, trace_java_call_enter);
        M_ALD_DSEG(REG_ITMP2, disp);
-       M_ASUB_IMM(96, REG_SP);
        M_CALL(REG_ITMP2);
-       M_AADD_IMM(96, REG_SP);
 
-       /* restore argument registers */
+       /* restore used argument registers */
+       /* for leaf methods restore all argument and temporary registers */
 
-       off = (6 * 8) + (1 * 4);
+       if (code_is_leafmethod(code)) {
+               off = 96 + (8 * md->paramcount);
 
-       for (i = 0; i < INT_ARG_CNT; i++, off += 8)
-               M_ILD(abi_registers_integer_argument[i], REG_SP, off);
-
-       for (i = 0; i < FLT_ARG_CNT; i++, off += 8)
-               M_DLD(abi_registers_float_argument[i], REG_SP, off);
+               for (i = 0; i < INT_ARG_CNT; ++i, off += 8) {
+                       M_ILD(abi_registers_integer_argument[i], REG_SP, off);
+               }
 
-       /* restore temporary registers for leaf methods */
+               for (i = 0; i < FLT_ARG_CNT; ++i, off += 8) {
+                       M_DLD(abi_registers_float_argument[i], REG_SP, off);
+               }
 
-       if (jd->isleafmethod) {
-               for (i = 0; i < INT_TMP_CNT; i++, off += 8)
+               for (i = 0; i < INT_TMP_CNT; ++i, off += 8) {
                        M_ILD(abi_registers_integer_temporary[i], REG_SP, off);
+               }
 
-               for (i = 0; i < FLT_TMP_CNT; i++, off += 8)
+               for (i = 0; i < FLT_TMP_CNT; ++i, off += 8) {
                        M_DLD(abi_registers_float_temporary[i], REG_SP, off);
+               }
+       } else {
+               off = 96;
+
+               for (i = 0; i < md->paramcount; i++) {
+                       if (! md->params[i].inmemory) {
+                               s = md->params[i].regoff;
+                               switch (md->paramtypes[i].type) {
+                                       case TYPE_INT:
+                                       case TYPE_ADR:
+                                               M_ILD(s, REG_SP, off);
+                                               break;
+                                       case TYPE_LNG:
+                                               M_LLD(s, REG_SP, off);
+                                               break;
+                                       case TYPE_FLT:
+                                               M_FLD(s, REG_SP, off);
+                                               break;
+                                       case TYPE_DBL:
+                                               M_DLD(s, REG_SP, off);
+                                               break;
+                               }
+                       }
+                       off += 8;
+               }
        }
 
-       /* remove stackframe */
+       /* remove stack frame */
 
        M_AADD_IMM(stackframesize, REG_SP);
 
        /* mark trace code */
 
        M_NOP;
+
 }
 #endif /* !defined(NDEBUG) */
 
@@ -634,47 +611,62 @@ void emit_verbosecall_exit(jitdata *jd)
 {
        methodinfo   *m;
        codegendata  *cd;
-       registerdata *rd;
        s4            disp;
-
-       /* get required compiler data */
+       s4            stackframesize;
+       s4            off;
+       s4            t;
 
        m  = jd->m;
        cd = jd->cd;
-       rd = jd->rd;
+       t = m->parseddesc->returntype.type;
 
        /* mark trace code */
 
        M_NOP;
 
-       M_ASUB_IMM(2 * 8, REG_SP);
+       /* allocate stackframe */
+
+       stackframesize = 96 + (1 * 8);
+       M_ASUB_IMM(stackframesize, REG_SP);
+
+       off = 96;
 
-       N_STM(REG_RESULT, REG_RESULT2, 0 * 8, REG_SP);
-       M_DST(REG_FRESULT, REG_SP, 1 * 8);
+       /* store return values in array */
 
-       if (IS_2_WORD_TYPE(m->parseddesc->returntype.type)) {
-               /* (REG_A0, REG_A1) == (REG_RESULT, REG_RESULT2), se no need to move */
+       if (IS_INT_LNG_TYPE(t)) {
+               if (IS_2_WORD_TYPE(t)) {
+                       M_LST(REG_RESULT_PACKED, REG_SP, off);
+               } else {
+                       M_IST(REG_RESULT, REG_SP, off);
+               }
        } else {
-               M_INTMOVE(REG_RESULT, REG_A1);
-               ICONST(REG_A0, 0);
+               M_DST(REG_FRESULT, REG_SP, off);
        }
 
+       /* call trace_java_call_exit */
+
        disp = dseg_add_address(cd, m);
-       M_ALD_DSEG(REG_A2, disp);
+       M_ALD_DSEG(REG_A0, disp);
+       M_LDA(REG_A1, REG_SP, off);
+       disp = dseg_add_functionptr(cd, trace_java_call_exit);
+       M_ALD_DSEG(REG_ITMP2, disp);
+       M_CALL(REG_ITMP2);
 
-       /* REG_FRESULT is REG_FA0, so no need to move */
-       M_FLTMOVE(REG_FRESULT, REG_FA1);
+       /* restore return value */
 
-       disp = dseg_add_address(cd, builtin_verbosecall_exit);
-       M_ALD_DSEG(REG_ITMP1, disp);
-       M_ASUB_IMM(96, REG_SP);
-       M_CALL(REG_ITMP1);
-       M_AADD_IMM(96, REG_SP);
+       if (IS_INT_LNG_TYPE(t)) {
+               if (IS_2_WORD_TYPE(t)) {
+                       M_LLD(REG_RESULT_PACKED, REG_SP, off);
+               } else {
+                       M_ILD(REG_RESULT, REG_SP, off);
+               }
+       } else {
+               M_DLD(REG_FRESULT, REG_SP, off);
+       }
 
-       N_LM(REG_RESULT, REG_RESULT2, 0 * 8, REG_SP);
-       M_DLD(REG_FRESULT, REG_SP, 1 * 8);
+       /* remove stackframe */
 
-       M_AADD_IMM(2 * 8, REG_SP);
+       M_AADD_IMM(stackframesize, REG_SP);
 
        /* mark trace code */
 
@@ -689,7 +681,7 @@ void emit_verbosecall_exit(jitdata *jd)
 
 *******************************************************************************/
 
-__PORTED__ s4 emit_load_high(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
+s4 emit_load_high(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
 {
        codegendata  *cd;
        s4            disp;
@@ -722,7 +714,7 @@ __PORTED__ s4 emit_load_high(jitdata *jd, instruction *iptr, varinfo *src, s4 te
 
 *******************************************************************************/
 
-__PORTED__ s4 emit_load_low(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
+s4 emit_load_low(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
 {
        codegendata  *cd;
        s4            disp;
@@ -749,32 +741,6 @@ __PORTED__ s4 emit_load_low(jitdata *jd, instruction *iptr, varinfo *src, s4 tem
        return reg;
 }
 
-s4 emit_load_s1_notzero(jitdata *jd, instruction *iptr, s4 tempreg) {
-       codegendata *cd = jd->cd;
-       s4 reg = emit_load_s1(jd, iptr, tempreg);
-       if (reg == 0) {
-               M_MOV(reg, tempreg);
-               return tempreg;
-       } else {
-               return reg;
-       }
-}
-
-s4 emit_load_s2_notzero(jitdata *jd, instruction *iptr, s4 tempreg) {
-       codegendata *cd = jd->cd;
-       s4 reg = emit_load_s2(jd, iptr, tempreg);
-       if (reg == 0) {
-               if (IS_FLT_DBL_TYPE(VAROP(iptr->sx.s23.s2)->type)) {
-                       M_FMOV(reg, tempreg);
-               } else {
-                       M_MOV(reg, tempreg);
-               }
-               return tempreg;
-       } else {
-               return reg;
-       }
-}
-
 s4 emit_load_s1_but(jitdata *jd, instruction *iptr, s4 tempreg, s4 notreg) {
        codegendata *cd = jd->cd;
        s4 reg = emit_load_s1(jd, iptr, tempreg);
@@ -805,96 +771,6 @@ s4 emit_load_s2_but(jitdata *jd, instruction *iptr, s4 tempreg, s4 notreg) {
        }
 }
 
-s4 emit_alloc_dst_even_odd(jitdata *jd, instruction *iptr, s4 htmpreg, s4 ltmpreg, s4 breg) {
-       codegendata *cd;
-       s4           hr, lr;
-       varinfo     *dst;
-
-       /* (r0, r1)    
-        * (r2, r3)
-        * (r4, r5)
-        * (r6, r7)
-        * (r8, r9)
-        * (r10, r11)
-        * (r12, r13) Illegal, because r13 is PV
-        * (r14, r15) Illegal, because r15 is SP
-        */
-
-       cd = jd->cd;
-       dst = VAROP(iptr->dst);
-
-       if (IS_INMEMORY(dst->flags)) {
-               if (! IS_REG_ITMP(ltmpreg)) {
-                       M_INTMOVE(ltmpreg, breg);
-               }
-               if (! IS_REG_ITMP(htmpreg)) {
-                       M_INTMOVE(htmpreg, breg);
-               }
-               return PACK_REGS(ltmpreg, htmpreg);
-       } else {
-               hr = GET_HIGH_REG(dst->vv.regoff);
-               lr = GET_LOW_REG(dst->vv.regoff);
-               if (((hr % 2) == 0) && lr == (hr + 1)) {
-                       /* the result is already in a even-odd pair */
-                       return dst->vv.regoff;                  
-               } else if (((hr % 2) == 0) && (hr < R12)) {
-                       /* the high register is at a even position */
-                       M_INTMOVE(hr + 1, breg);
-                       return PACK_REGS(hr + 1, hr);
-               } else if (((lr % 2) == 1) && (lr < R12)) {
-                       /* the low register is at a odd position */
-                       M_INTMOVE(lr - 1, breg);
-                       return PACK_REGS(lr, lr - 1);
-               } else {
-                       /* no way to create an even-odd pair by 1 copy operation,
-                        * Use the temporary register pair.
-                        */
-                       if (! IS_REG_ITMP(ltmpreg)) {
-                               M_INTMOVE(ltmpreg, breg);
-                       }
-                       if (! IS_REG_ITMP(htmpreg)) {
-                               M_INTMOVE(htmpreg, breg);
-                       }
-                       return PACK_REGS(ltmpreg, htmpreg);
-               }
-       }
-}
-
-void emit_restore_dst_even_odd(jitdata *jd, instruction *iptr, s4 htmpreg, s4 ltmpreg, s4 breg) {
-       codegendata *cd;
-       s4           hr, lr;
-       varinfo     *dst;
-
-       cd = jd->cd;
-       dst = VAROP(iptr->dst);
-
-       if (IS_INMEMORY(dst->flags)) {
-               if (! IS_REG_ITMP(ltmpreg)) {
-                       M_INTMOVE(breg, ltmpreg);
-               }
-               if (! IS_REG_ITMP(htmpreg)) {
-                       M_INTMOVE(breg, htmpreg);
-               }
-       } else {
-               hr = GET_HIGH_REG(dst->vv.regoff);
-               lr = GET_LOW_REG(dst->vv.regoff);
-               if (((hr % 2) == 0) && lr == (hr + 1)) {
-                       return;
-               } else if (((hr % 2) == 0) && (hr < R12)) {
-                       M_INTMOVE(breg, hr + 1);
-               } else if (((lr % 2) == 1) && (lr < R12)) {
-                       M_INTMOVE(breg, lr - 1);
-               } else {
-                       if (! IS_REG_ITMP(ltmpreg)) {
-                               M_INTMOVE(breg, ltmpreg);
-                       }
-                       if (! IS_REG_ITMP(htmpreg)) {
-                               M_INTMOVE(breg, htmpreg);
-                       }
-               }
-       }
-}
-
 void emit_copy_dst(jitdata *jd, instruction *iptr, s4 dtmpreg) {
        codegendata *cd;
        varinfo *dst;
@@ -1000,23 +876,22 @@ void emit_branch(codegendata *cd, s4 disp, s4 condition, s4 reg, u4 opt) {
                /* The actual long branch */
 
                disp = dseg_add_s4(cd, branchmpc + disp - N_PV_OFFSET);
-               M_ILD_DSEG(REG_ITMP3, disp);
-               M_AADD(REG_PV, REG_ITMP3);
-               M_JMP(RN, REG_ITMP3);
+               M_ILD_DSEG(REG_ITMP2, disp);
+               M_AADD(REG_PV, REG_ITMP2);
+               M_JMP(RN, REG_ITMP2);
 
                /* Patch back the displacement */
 
-               if (ref != NULL) {
-                       *(u4 *)ref |= (u4)((cd->mcodeptr - ref) / 2);
-               }
+               N_BRC_BACK_PATCH(ref);
        }
 }
 
-void emit_arithmetic_check(codegendata *cd, instruction *iptr, s4 reg) {
+void emit_arithmetic_check(codegendata *cd, instruction *iptr, s4 reg)
+{
        if (INSTRUCTION_MUST_CHECK(iptr)) {
                M_TEST(reg);
                M_BNE(SZ_BRC + SZ_ILL);
-               M_ILL(EXCEPTION_HARDWARE_ARITHMETIC);
+               M_ILL(TRAP_ArithmeticException);
        }
 }
 
@@ -1032,12 +907,29 @@ void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1,
                /* Size is s4, >= 0
                 * Do unsigned comparison to catch negative indexes.
                 */
-               N_CL(s2, OFFSET(java_arrayheader, size), RN, s1);
+               N_CL(s2, OFFSET(java_array_t, size), RN, s1);
         M_BLT(SZ_BRC + SZ_ILL);
-               M_ILL2(s2, EXCEPTION_HARDWARE_ARRAYINDEXOUTOFBOUNDS);
+               M_ILL2(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(SZ_BRC + SZ_ILL);
+               M_ILL(TRAP_ArrayStoreException);
+       }
+}
+
+
 void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 reg, s4 s1) {
        if (INSTRUCTION_MUST_CHECK(iptr)) {
                if (reg != RN) {
@@ -1056,27 +948,29 @@ void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 r
                        default:
                                vm_abort("emit_classcast_check: unknown condition %d", condition);
                }
-               M_ILL2(s1, EXCEPTION_HARDWARE_CLASSCAST);
+               M_ILL2(s1, TRAP_ClassCastException);
        }
 }
 
-void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg) {
+void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg)
+{
        if (INSTRUCTION_MUST_CHECK(iptr)) {
                M_TEST(reg);
                M_BNE(SZ_BRC + SZ_ILL);
-               M_ILL(EXCEPTION_HARDWARE_NULLPOINTER);
+               M_ILL(TRAP_NullPointerException);
        }
 }
 
-void emit_exception_check(codegendata *cd, instruction *iptr) {
+void emit_exception_check(codegendata *cd, instruction *iptr)
+{
        if (INSTRUCTION_MUST_CHECK(iptr)) {
                M_TEST(REG_RESULT);
                M_BNE(SZ_BRC + SZ_ILL);
-               M_ILL(EXCEPTION_HARDWARE_EXCEPTION);
+               M_ILL(TRAP_CHECK_EXCEPTION);
        }
 }
 
-void emit_restore_pv(codegendata *cd) {
+void emit_recompute_pv(codegendata *cd) {
        s4 offset, offset_imm;
 
        /*
@@ -1110,6 +1004,17 @@ void emit_restore_pv(codegendata *cd) {
        }
 }
 
+/* emit_trap_compiler **********************************************************
+
+   Emit a trap instruction which calls the JIT compiler.
+
+*******************************************************************************/
+
+void emit_trap_compiler(codegendata *cd)
+{
+       M_ILL2(REG_METHODPTR, TRAP_COMPILER);
+}
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where