* src/threads/posix/thread-posix.cpp: Eliminated some easy-to-fix or pointless compil...
[cacao.git] / src / vm / jit / x86_64 / codegen.c
index c893028b4fa2d6c021e3087be997cce8b03918c6..3a4acd2ea61482646c34b3a4593e19de345d75de 100644 (file)
@@ -1,9 +1,7 @@
 /* src/vm/jit/x86_64/codegen.c - machine code generator for x86_64
 
-   Copyright (C) 1996-2005, 2006 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, 2009, 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.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Andreas Krall
-            Christian Thalinger
-
-   Changes: Christian Ullrich
-            Edwin Steiner
-
-   $Id: codegen.c 5839 2006-10-26 11:57:16Z twisti $
-
 */
 
 
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #include "vm/types.h"
+#include "vm/os.hpp"
 
 #include "md-abi.h"
 
 #include "vm/jit/x86_64/codegen.h"
 #include "vm/jit/x86_64/emit.h"
 
-#include "mm/memory.h"
-#include "native/jni.h"
-#include "native/native.h"
+#include "mm/memory.hpp"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "native/localref.hpp"
+#include "native/native.hpp"
+
+#include "threads/lock.hpp"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/jit/builtin.hpp"
+#include "vm/exceptions.hpp"
 #include "vm/global.h"
-#include "vm/loader.h"
+#include "vm/loader.hpp"
 #include "vm/options.h"
+#include "vm/primitive.hpp"
 #include "vm/statistics.h"
-#include "vm/stringlocal.h"
-#include "vm/vm.h"
+#include "vm/string.hpp"
+#include "vm/vm.hpp"
+
+#include "vm/jit/abi.h"
 #include "vm/jit/asmpart.h"
-#include "vm/jit/codegen-common.h"
+#include "vm/jit/code.hpp"
+#include "vm/jit/codegen-common.hpp"
 #include "vm/jit/dseg.h"
-#include "vm/jit/emit-common.h"
-#include "vm/jit/jit.h"
+#include "vm/jit/emit-common.hpp"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/linenumbertable.hpp"
 #include "vm/jit/methodheader.h"
-#include "vm/jit/parse.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/parse.hpp"
+#include "vm/jit/patcher-common.hpp"
 #include "vm/jit/reg.h"
-#include "vm/jit/replace.h"
-
-#if defined(ENABLE_LSRA)
-# include "vm/jit/allocator/lsra.h"
-#endif
-
-
-/* codegen *********************************************************************
-
-   Generates machine code.
+#include "vm/jit/stacktrace.hpp"
+#include "vm/jit/trap.hpp"
 
-*******************************************************************************/
 
-bool codegen(jitdata *jd)
+/**
+ * Generates machine code for the method prolog.
+ */
+void codegen_emit_prolog(jitdata* jd)
 {
-       methodinfo         *m;
-       codeinfo           *code;
-       codegendata        *cd;
-       registerdata       *rd;
-       s4                  len, s1, s2, s3, d, disp;
-       u2                  currentline;
-       ptrint              a;
-       varinfo            *var, *var1, *var2, *dst;
-       basicblock         *bptr;
-       instruction        *iptr;
-       exception_entry    *ex;
-       methodinfo         *lm;             /* local methodinfo for ICMD_INVOKE*  */
-       unresolved_method  *um;
-       builtintable_entry *bte;
-       methoddesc         *md;
-       fieldinfo          *fi;
-       unresolved_field   *uf;
-       s4                  fieldtype;
-       rplpoint           *replacementpoint;
-       s4                 varindex;
-
-       /* get required compiler data */
-
-       m    = jd->m;
-       code = jd->code;
-       cd   = jd->cd;
-       rd   = jd->rd;
-
-       /* prevent compiler warnings */
-
-       d   = 0;
-       lm  = NULL;
-       um  = NULL;
-       bte = NULL;
-
-       {
-       s4 i, p, t, l;
-       s4 savedregs_num;
-
-       savedregs_num = 0;
-
-       /* space to save used callee saved registers */
-
-       savedregs_num += (INT_SAV_CNT - rd->savintreguse);
-       savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);
-
-       cd->stackframesize = rd->memuse + savedregs_num;
-
-#if defined(ENABLE_THREADS)
-       /* space to save argument of monitor_enter */
-
-       if (checksync && (m->flags & ACC_SYNCHRONIZED))
-               cd->stackframesize++;
-#endif
-
-       /* Keep stack of non-leaf functions 16-byte aligned for calls into
-          native code e.g. libc or jni (alignment problems with
-          movaps). */
-
-       if (!jd->isleafmethod || opt_verbosecall)
-               cd->stackframesize |= 0x1;
-
-       /* create method header */
-
-       (void) dseg_addaddress(cd, code);                      /* CodeinfoPointer */
-       (void) dseg_adds4(cd, cd->stackframesize * 8);         /* FrameSize       */
-
-#if defined(ENABLE_THREADS)
-       /* IsSync contains the offset relative to the stack pointer for the
-          argument of monitor_exit used in the exception handler. Since the
-          offset could be zero and give a wrong meaning of the flag it is
-          offset by one.
-       */
-
-       if (checksync && (m->flags & ACC_SYNCHRONIZED))
-               (void) dseg_adds4(cd, (rd->memuse + 1) * 8);       /* IsSync          */
-       else
-#endif
-               (void) dseg_adds4(cd, 0);                          /* IsSync          */
-                                              
-       (void) dseg_adds4(cd, jd->isleafmethod);               /* IsLeaf          */
-       (void) dseg_adds4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave         */
-       (void) dseg_adds4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave         */
-
-       (void) dseg_addlinenumbertablesize(cd);
-
-       (void) dseg_adds4(cd, jd->exceptiontablelength);       /* ExTableSize     */
-
-       /* create exception table */
-
-       for (ex = jd->exceptiontable; ex != NULL; ex = ex->down) {
-               dseg_addtarget(cd, ex->start);
-               dseg_addtarget(cd, ex->end);
-               dseg_addtarget(cd, ex->handler);
-               (void) dseg_addaddress(cd, ex->catchtype.any);
-       }
-       
-       /* generate method profiling code */
-
-       if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
-               /* count frequency */
-
-               M_MOV_IMM(code, REG_ITMP3);
-               M_IINC_MEMBASE(REG_ITMP3, OFFSET(codeinfo, frequency));
-
-               PROFILE_CYCLE_START;
-       }
+       varinfo*    var;
+       methoddesc* md;
+       int32_t     s1;
+       int32_t     p, t, l;
+       int32_t     varindex;
+       int         i;
+
+       // Get required compiler data.
+       methodinfo*   m  = jd->m;
+       codegendata*  cd = jd->cd;
+       registerdata* rd = jd->rd;
 
        /* create stack frame (if necessary) */
 
@@ -232,240 +124,114 @@ bool codegen(jitdata *jd)
                s1 = md->params[p].regoff;
 
                if (IS_INT_LNG_TYPE(t)) {                    /* integer args          */
-                       s2 = rd->argintregs[s1];
                        if (!md->params[p].inmemory) {           /* register arguments    */
-                               if (!IS_INMEMORY(var->flags)) {      /* reg arg -> register   */
-                                       M_INTMOVE(s2, var->vv.regoff);
-
-                               } else {                             /* reg arg -> spilled    */
-                                   M_LST(s2, REG_SP, var->vv.regoff * 8);
-                               }
-
-                       } else {                                 /* stack arguments       */
-                               if (!IS_INMEMORY(var->flags)) {      /* stack arg -> register */
+                               if (!IS_INMEMORY(var->flags))
+                                       M_INTMOVE(s1, var->vv.regoff);
+                               else
+                                   M_LST(s1, REG_SP, var->vv.regoff);
+                       }
+                       else {                                 /* stack arguments       */
+                               if (!IS_INMEMORY(var->flags))
                                        /* + 8 for return address */
-                                       M_LLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8 + 8);
-
-                               } else {                             /* stack arg -> spilled  */
-                                       var->vv.regoff = cd->stackframesize + s1 + 1;
-                               }
+                                       M_LLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1 + 8);
+                               else
+                                       var->vv.regoff = cd->stackframesize * 8 + s1 + 8;
                        }
-
-               else {                                     /* floating args         */
+               }
+               else {                                     /* floating args         */
                        if (!md->params[p].inmemory) {           /* register arguments    */
-                               s2 = rd->argfltregs[s1];
-                               if (!IS_INMEMORY(var->flags)) {      /* reg arg -> register   */
-                                       M_FLTMOVE(s2, var->vv.regoff);
-
-                               } else {                                         /* reg arg -> spilled    */
-                                       M_DST(s2, REG_SP, var->vv.regoff * 8);
-                               }
-
-                       } else {                                 /* stack arguments       */
-                               if (!IS_INMEMORY(var->flags)) {      /* stack-arg -> register */
-                                       M_DLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8 + 8);
-
-                               } else {
-                                       var->vv.regoff = cd->stackframesize + s1 + 1;
-                               }
+                               if (!IS_INMEMORY(var->flags))
+                                       emit_fmove(cd, s1, var->vv.regoff);
+                               else
+                                       M_DST(s1, REG_SP, var->vv.regoff);
+                       }
+                       else {                                 /* stack arguments       */
+                               if (!IS_INMEMORY(var->flags))
+                                       M_DLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1 + 8);
+                               else
+                                       var->vv.regoff = cd->stackframesize * 8 + s1 + 8;
                        }
                }
-       }  /* end for */
-
-       /* save monitorenter argument */
-
-#if defined(ENABLE_THREADS)
-       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
-               /* stack offset for monitor argument */
-
-               s1 = rd->memuse;
-
-               if (opt_verbosecall) {
-                       M_LSUB_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
-
-                       for (p = 0; p < INT_ARG_CNT; p++)
-                               M_LST(rd->argintregs[p], REG_SP, p * 8);
-
-                       for (p = 0; p < FLT_ARG_CNT; p++)
-                               M_DST(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
-
-                       s1 += INT_ARG_CNT + FLT_ARG_CNT;
-               }
+       }
+}
 
-               /* decide which monitor enter function to call */
 
-               if (m->flags & ACC_STATIC) {
-                       M_MOV_IMM(&m->class->object.header, REG_A0);
-               }
-               else {
-                       M_TEST(REG_A0);
-                       M_BEQ(0);
-                       codegen_add_nullpointerexception_ref(cd);
-               }
+/**
+ * Generates machine code for the method epilog.
+ */
+void codegen_emit_epilog(jitdata* jd)
+{
+       int32_t p;
+       int i;
 
-               M_AST(REG_A0, REG_SP, s1 * 8);
-               M_MOV_IMM(LOCK_monitor_enter, REG_ITMP1);
-               M_CALL(REG_ITMP1);
+       // Get required compiler data.
+       codegendata*  cd = jd->cd;
+       registerdata* rd = jd->rd;
 
-               if (opt_verbosecall) {
-                       for (p = 0; p < INT_ARG_CNT; p++)
-                               M_LLD(rd->argintregs[p], REG_SP, p * 8);
+       p = cd->stackframesize;
 
-                       for (p = 0; p < FLT_ARG_CNT; p++)
-                               M_DLD(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
+       /* restore saved registers */
 
-                       M_LADD_IMM((INT_ARG_CNT + FLT_ARG_CNT) * 8, REG_SP);
-               }
+       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+               p--; M_LLD(rd->savintregs[i], REG_SP, p * 8);
        }
-#endif
-
-#if !defined(NDEBUG)
-       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-               emit_verbosecall_enter(jd);
-#endif /* !defined(NDEBUG) */
-
+       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+               p--; M_DLD(rd->savfltregs[i], REG_SP, p * 8);
        }
 
-       /* end of header generation */
-
-       replacementpoint = jd->code->rplpoints;
-
-       /* walk through all basic blocks */
-
-       for (bptr = jd->basicblocks; bptr != NULL; bptr = bptr->next) {
-
-               bptr->mpc = (u4) ((u1 *) cd->mcodeptr - cd->mcodebase);
-
-               if (bptr->flags >= BBREACHED) {
-
-                       /* branch resolving */
-
-                       branchref *bref;
-                       for (bref = bptr->branchrefs; bref != NULL; bref = bref->next) {
-                               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                                                 bref->branchpos,
-                                                                 bptr->mpc);
-                       }
-
-               /* handle replacement points */
-
-#if 0
-               if (bptr->bitflags & BBFLAG_REPLACEMENT) {
-                       replacementpoint->pc = (u1*)(ptrint)bptr->mpc; /* will be resolved later */
-                       
-                       replacementpoint++;
-
-                       assert(cd->lastmcodeptr <= cd->mcodeptr);
-                       cd->lastmcodeptr = cd->mcodeptr + 5; /* 5 byte jmp patch */
-               }
-#endif
-
-               /* copy interface registers to their destination */
-
-               len = bptr->indepth;
-               MCODECHECK(512);
-
-               /* generate basicblock profiling code */
-
-               if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
-                       /* count frequency */
-
-                       M_MOV_IMM(code->bbfrequency, REG_ITMP3);
-                       M_IINC_MEMBASE(REG_ITMP3, bptr->nr * 4);
-
-                       /* if this is an exception handler, start profiling again */
-
-                       if (bptr->type == BBTYPE_EXH)
-                               PROFILE_CYCLE_START;
-               }
-
-#if defined(ENABLE_LSRA)
-               if (opt_lsra) {
-                       while (len) {
-                               len--;
-                               src = bptr->invars[len];
-                               if ((len == bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
-                                       if (bptr->type == BBTYPE_EXH) {
-/*                                     d = reg_of_var(rd, src, REG_ITMP1); */
-                                               if (!IS_INMEMORY(src->flags))
-                                                       d= src->vv.regoff;
-                                               else
-                                                       d=REG_ITMP1;
-                                               M_INTMOVE(REG_ITMP1, d);
-                                               emit_store(jd, NULL, src, d);
-                                       }
-                               }
-                       }
-                       
-               } else {
-#endif
-
-               while (len) {
-                       len--;
-                       var = VAR(bptr->invars[len]);
-                       if ((len ==  bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
-                               if (bptr->type == BBTYPE_EXH) {
-                                       d = codegen_reg_of_var(0, var, REG_ITMP1);
-                                       M_INTMOVE(REG_ITMP1, d);
-                                       emit_store(jd, NULL, var, d);
-                               }
-                       } 
-                       else {
-                               assert((var->flags & INOUT));
-                       }
-               }
-#if defined(ENABLE_LSRA)
-               }
-#endif
-               /* walk through all instructions */
-               
-               len = bptr->icount;
-               currentline = 0;
-
-               for (iptr = bptr->iinstr; len > 0; len--, iptr++) {
-                       if (iptr->line != currentline) {
-                               dseg_addlinenumber(cd, iptr->line);
-                               currentline = iptr->line;
-                       }
-
-                       MCODECHECK(1024);                         /* 1KB should be enough */
+       /* deallocate stack */
 
-                       switch (iptr->opc) {
-                       case ICMD_INLINE_START: /* internal ICMDs                         */
-                       case ICMD_INLINE_END:
-                               break;
+       if (cd->stackframesize)
+               M_AADD_IMM(cd->stackframesize * 8, REG_SP);
 
-                       case ICMD_NOP:    /* ...  ==> ...                                 */
-                               break;
+       M_RET;
+}
 
-                       case ICMD_CHECKNULL: /* ..., objectref  ==> ..., objectref        */
+/**
+ * Generates a memory barrier to be used after volatile writes. It can be
+ * patched out later if the field turns out not to be volatile.
+ */
+void codegen_emit_patchable_barrier(instruction *iptr, codegendata *cd, patchref_t *pr, fieldinfo *fi)
+{
+       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+               /* Align on word boundary */
+               if ((((intptr_t) cd->mcodeptr) & 3) >= 2)
+                       emit_nop(cd, 4 - (((intptr_t) cd->mcodeptr) & 3));
+               /* Displacement for patching out MFENCE */
+               pr->disp_mb = (cd->mcodeptr - cd->mcodebase - pr->mpc);
+       }
+       if (INSTRUCTION_IS_UNRESOLVED(iptr) || fi->flags & ACC_VOLATILE)
+               M_MFENCE;
+}
 
-                               s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                               M_TEST(s1);
-                               M_BEQ(0);
-                               codegen_add_nullpointerexception_ref(cd);
-                               break;
+/**
+ * Generates machine code for one ICMD.
+ */
+void codegen_emit_instruction(jitdata* jd, instruction* iptr)
+{
+       varinfo*            var;
+       varinfo*            dst;
+       builtintable_entry* bte;
+       methodinfo*         lm;             // Local methodinfo for ICMD_INVOKE*.
+       unresolved_method*  um;
+       fieldinfo*          fi;
+       unresolved_field*   uf;
+       patchref_t*         pr;
+       int32_t             fieldtype;
+       int32_t             s1, s2, s3, d;
+       int32_t             disp;
+
+       // Get required compiler data.
+       codegendata*  cd = jd->cd;
+
+       switch (iptr->opc) {
 
                /* constant operations ************************************************/
 
-               case ICMD_ICONST:     /* ...  ==> ..., constant                       */
-
-                       d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
-                       ICONST(d, iptr->sx.val.i);
-                       emit_store_dst(jd, iptr, d);
-                       break;
-
-               case ICMD_LCONST:     /* ...  ==> ..., constant                       */
-
-                       d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
-                       LCONST(d, iptr->sx.val.l);
-                       emit_store_dst(jd, iptr, d);
-                       break;
-
                case ICMD_FCONST:     /* ...  ==> ..., constant                       */
 
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
-                       disp = dseg_addfloat(cd, iptr->sx.val.f);
+                       disp = dseg_add_float(cd, iptr->sx.val.f);
                        emit_movdl_membase_reg(cd, RIP, -((cd->mcodeptr + ((d > 7) ? 9 : 8)) - cd->mcodebase) + disp, d);
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -473,7 +239,7 @@ bool codegen(jitdata *jd)
                case ICMD_DCONST:     /* ...  ==> ..., constant                       */
 
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
-                       disp = dseg_adddouble(cd, iptr->sx.val.d);
+                       disp = dseg_add_double(cd, iptr->sx.val.d);
                        emit_movd_membase_reg(cd, RIP, -((cd->mcodeptr + 9) - cd->mcodebase) + disp, d);
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -483,58 +249,31 @@ bool codegen(jitdata *jd)
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-/*                             PROFILE_CYCLE_STOP; */
+                               constant_classref *cr = iptr->sx.val.c.ref;
+                               disp = dseg_add_unique_address(cd, cr);
 
-                               codegen_addpatchref(cd, PATCHER_aconst,
-                                                                       iptr->sx.val.c.ref, 0);
+/*                             PROFILE_CYCLE_STOP; */
 
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
+                               patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
+                                                                         cr, disp);
 
 /*                             PROFILE_CYCLE_START; */
 
-                               M_MOV_IMM(NULL, d);
-
-                       else {
-                               if (iptr->sx.val.anyptr == 0)
+                               M_ALD(d, RIP, disp);
+                       }
+                       else {
+                               if (iptr->sx.val.anyptr == 0) {
                                        M_CLR(d);
-                               else
-                                       M_MOV_IMM(iptr->sx.val.anyptr, d);
+                               }
+                               else {
+                                       disp = dseg_add_address(cd, iptr->sx.val.anyptr);
+                                       M_ALD(d, RIP, disp);
+                               }
                        }
                        emit_store_dst(jd, iptr, d);
                        break;
 
 
-               /* load/store/copy/move operations ************************************/
-
-               case ICMD_ILOAD:      /* ...  ==> ..., content of local variable      */
-               case ICMD_ALOAD:      /* s1 = local variable                          */
-               case ICMD_LLOAD:
-               case ICMD_FLOAD:  
-               case ICMD_DLOAD:  
-               case ICMD_ISTORE:     /* ..., value  ==> ...                          */
-               case ICMD_ASTORE:     /* dst = local variable                         */
-               case ICMD_LSTORE:
-               case ICMD_FSTORE:
-               case ICMD_DSTORE: 
-               case ICMD_COPY:
-               case ICMD_MOVE:
-                       
-                       emit_copy(jd, iptr, VAROP(iptr->s1), VAROP(iptr->dst));
-                       break;
-
-
-               /* pop operations *****************************************************/
-
-               /* attention: double and longs are only one entry in CACAO ICMDs      */
-
-               case ICMD_POP:        /* ..., value  ==> ...                          */
-               case ICMD_POP2:       /* ..., value, value  ==> ...                   */
-
-                       break;
-
-
                /* integer operations *************************************************/
 
                case ICMD_INEG:       /* ..., value  ==> ..., - value                 */
@@ -769,96 +508,57 @@ bool codegen(jitdata *jd)
 
                case ICMD_IDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
 
-                       var1 = VAROP(iptr->s1);
-                       var2 = VAROP(iptr->sx.s23.s2);
-                       dst  = VAROP(iptr->dst);
-
-                       d = codegen_reg_of_dst(jd, iptr, REG_NULL);
-                       if (IS_INMEMORY(var1->flags))
-                               M_ILD(RAX, REG_SP, var1->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var1->vv.regoff, RAX);
-                       
-                       if (IS_INMEMORY(var2->flags))
-                               M_ILD(REG_ITMP3, REG_SP, var2->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var2->vv.regoff, REG_ITMP3);
-                       
-                       if (checknull) {
-                               M_ITEST(REG_ITMP3);
-                               M_BEQ(0);
-                               codegen_add_arithmeticexception_ref(cd);
-                       }
+                       s1 = emit_load_s1(jd, iptr, RAX);
+                       s2 = emit_load_s2(jd, iptr, REG_ITMP3);
+                       d = codegen_reg_of_dst(jd, iptr, RAX);
 
-                       emit_alul_imm_reg(cd, ALU_CMP, 0x80000000, RAX); /* check as described in jvm spec */
-                       emit_jcc(cd, CC_NE, 4 + 6);
-                       emit_alul_imm_reg(cd, ALU_CMP, -1, REG_ITMP3);    /* 4 bytes */
-                       emit_jcc(cd, CC_E, 3 + 1 + 3);                /* 6 bytes */
+                       M_INTMOVE(s1, RAX);
+                       M_INTMOVE(s2, REG_ITMP3);
+                       emit_arithmetic_check(cd, iptr, REG_ITMP3);
 
-                       emit_mov_reg_reg(cd, RDX, REG_ITMP2); /* save %rdx, cause it's an argument register */
-                       emit_cltd(cd);
-                       emit_idivl_reg(cd, REG_ITMP3);
+                       M_MOV(RDX, REG_ITMP2);    /* save RDX (it's an argument register) */
 
-                       if (IS_INMEMORY(dst->flags)) {
-                               emit_mov_reg_membase(cd, RAX, REG_SP, dst->vv.regoff * 8);
-                               emit_mov_reg_reg(cd, REG_ITMP2, RDX);       /* restore %rdx */
+                       M_ICMP_IMM(0x80000000, RAX);    /* check as described in jvm spec */
+                       M_BNE(4 + 6);
+                       M_ICMP_IMM(-1, REG_ITMP3);                             /* 4 bytes */
+                       M_BEQ(1 + 3);                                          /* 6 bytes */
 
-                       } else {
-                               M_INTMOVE(RAX, dst->vv.regoff);
+                       emit_cltd(cd);                                         /* 1 byte  */
+                       emit_idivl_reg(cd, REG_ITMP3);                         /* 3 bytes */
 
-                               if (dst->vv.regoff != RDX) {
-                                       emit_mov_reg_reg(cd, REG_ITMP2, RDX);   /* restore %rdx */
-                               }
-                       }
+                       M_INTMOVE(RAX, d);
+                       emit_store_dst(jd, iptr, d);
+                       dst = VAROP(iptr->dst);
+                       if (IS_INMEMORY(dst->flags) || (dst->vv.regoff != RDX))
+                               M_MOV(REG_ITMP2, RDX);                         /* restore RDX */
                        break;
 
                case ICMD_IREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
 
-                       var1 = VAROP(iptr->s1);
-                       var2 = VAROP(iptr->sx.s23.s2);
-                       dst  = VAROP(iptr->dst);
-
-                       d = codegen_reg_of_dst(jd, iptr, REG_NULL);
-                       if (IS_INMEMORY(var1->flags))
-                               M_ILD(RAX, REG_SP, var1->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var1->vv.regoff, RAX);
-                       
-                       if (IS_INMEMORY(var2->flags))
-                               M_ILD(REG_ITMP3, REG_SP, var2->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var2->vv.regoff, REG_ITMP3);
-
-                       if (checknull) {
-                               M_ITEST(REG_ITMP3);
-                               M_BEQ(0);
-                               codegen_add_arithmeticexception_ref(cd);
-                       }
-
-                       emit_mov_reg_reg(cd, RDX, REG_ITMP2); /* save %rdx, cause it's an argument register */
-
-                       emit_alul_imm_reg(cd, ALU_CMP, 0x80000000, RAX); /* check as described in jvm spec */
-                       emit_jcc(cd, CC_NE, 2 + 4 + 6);
-
+                       s1 = emit_load_s1(jd, iptr, RAX);
+                       s2 = emit_load_s2(jd, iptr, REG_ITMP3);
+                       d = codegen_reg_of_dst(jd, iptr, RDX);
 
-                       emit_alul_reg_reg(cd, ALU_XOR, RDX, RDX);         /* 2 bytes */
-                       emit_alul_imm_reg(cd, ALU_CMP, -1, REG_ITMP3);    /* 4 bytes */
-                       emit_jcc(cd, CC_E, 1 + 3);                    /* 6 bytes */
+                       M_INTMOVE(s1, RAX);
+                       M_INTMOVE(s2, REG_ITMP3);
+                       emit_arithmetic_check(cd, iptr, REG_ITMP3);
 
-                       emit_cltd(cd);
-                       emit_idivl_reg(cd, REG_ITMP3);
+                       M_MOV(RDX, REG_ITMP2);    /* save RDX (it's an argument register) */
 
-                       if (IS_INMEMORY(dst->flags)) {
-                               emit_mov_reg_membase(cd, RDX, REG_SP, dst->vv.regoff * 8);
-                               emit_mov_reg_reg(cd, REG_ITMP2, RDX);       /* restore %rdx */
+                       M_ICMP_IMM(0x80000000, RAX);    /* check as described in jvm spec */
+                       M_BNE(3 + 4 + 6);
+                       M_CLR(RDX);                                            /* 3 bytes */
+                       M_ICMP_IMM(-1, REG_ITMP3);                             /* 4 bytes */
+                       M_BEQ(1 + 3);                                          /* 6 bytes */
 
-                       } else {
-                               M_INTMOVE(RDX, dst->vv.regoff);
+                       emit_cltd(cd);                                         /* 1 byte  */
+                       emit_idivl_reg(cd, REG_ITMP3);                         /* 3 byte  */
 
-                               if (dst->vv.regoff != RDX) {
-                                       emit_mov_reg_reg(cd, REG_ITMP2, RDX);   /* restore %rdx */
-                               }
-                       }
+                       M_INTMOVE(RDX, d);
+                       emit_store_dst(jd, iptr, d);
+                       dst = VAROP(iptr->dst);
+                       if (IS_INMEMORY(dst->flags) || (dst->vv.regoff != RDX))
+                               M_MOV(REG_ITMP2, RDX);                         /* restore RDX */
                        break;
 
                case ICMD_IDIVPOW2:   /* ..., value  ==> ..., value >> constant       */
@@ -893,109 +593,61 @@ bool codegen(jitdata *jd)
 
                case ICMD_LDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
 
-                       var1 = VAROP(iptr->s1);
-                       var2 = VAROP(iptr->sx.s23.s2);
-                       dst  = VAROP(iptr->dst);
-
-                       d = codegen_reg_of_dst(jd, iptr, REG_NULL);
+                       s1 = emit_load_s1(jd, iptr, RAX);
+                       s2 = emit_load_s2(jd, iptr, REG_ITMP3);
+                       d = codegen_reg_of_dst(jd, iptr, RAX);
 
-               if (IS_INMEMORY(var1->flags))
-                               M_LLD(RAX, REG_SP, var1->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var1->vv.regoff, RAX);
-                       
-                       if (IS_INMEMORY(var2->flags))
-                               M_LLD(REG_ITMP3, REG_SP, var2->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var2->vv.regoff, REG_ITMP3);
+                       M_INTMOVE(s1, RAX);
+                       M_INTMOVE(s2, REG_ITMP3);
+                       emit_arithmetic_check(cd, iptr, REG_ITMP3);
 
-                       if (checknull) {
-                               M_TEST(REG_ITMP3);
-                               M_BEQ(0);
-                               codegen_add_arithmeticexception_ref(cd);
-                       }
+                       M_MOV(RDX, REG_ITMP2);    /* save RDX (it's an argument register) */
 
                        /* check as described in jvm spec */
-                       disp = dseg_adds8(cd, 0x8000000000000000LL);
+                       disp = dseg_add_s8(cd, 0x8000000000000000LL);
                        M_LCMP_MEMBASE(RIP, -((cd->mcodeptr + 7) - cd->mcodebase) + disp, RAX);
                        M_BNE(4 + 6);
-                       M_LCMP_IMM(-1, REG_ITMP3);                              /* 4 bytes */
-                       M_BEQ(3 + 2 + 3);                                      /* 6 bytes */
-
-                       M_MOV(RDX, REG_ITMP2); /* save %rdx, cause it's an argument register */
-                       emit_cqto(cd);
-                       emit_idiv_reg(cd, REG_ITMP3);
-
-                       if (IS_INMEMORY(dst->flags)) {
-                               M_LST(RAX, REG_SP, dst->vv.regoff * 8);
-                               M_MOV(REG_ITMP2, RDX);                        /* restore %rdx */
+                       M_LCMP_IMM(-1, REG_ITMP3);                             /* 4 bytes */
+                       M_BEQ(2 + 3);                                          /* 6 bytes */
 
-                       } else {
-                               M_INTMOVE(RAX, dst->vv.regoff);
+                       emit_cqto(cd);                                         /* 2 bytes */
+                       emit_idiv_reg(cd, REG_ITMP3);                          /* 3 bytes */
 
-                               if (dst->vv.regoff != RDX) {
-                                       M_MOV(REG_ITMP2, RDX);                    /* restore %rdx */
-                               }
-                       }
+                       M_INTMOVE(RAX, d);
+                       emit_store_dst(jd, iptr, d);
+                       dst = VAROP(iptr->dst);
+                       if (IS_INMEMORY(dst->flags) || (dst->vv.regoff != RDX))
+                               M_MOV(REG_ITMP2, RDX);                         /* restore RDX */
                        break;
 
                case ICMD_LREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
 
-                       var1 = VAROP(iptr->s1);
-                       var2 = VAROP(iptr->sx.s23.s2);
-                       dst  = VAROP(iptr->dst);
-
-                       d = codegen_reg_of_dst(jd, iptr, REG_NULL);
-                       
-                       if (IS_INMEMORY(var1->flags))
-                               M_LLD(REG_ITMP1, REG_SP, var1->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var1->vv.regoff, REG_ITMP1);
-                       
-                       if (IS_INMEMORY(var2->flags))
-                               M_LLD(REG_ITMP3, REG_SP, var2->vv.regoff * 8);
-                       else
-                               M_INTMOVE(var2->vv.regoff, REG_ITMP3);
-                       /*
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_INTMOVE(s1, REG_ITMP1);
+                       s1 = emit_load_s1(jd, iptr, RAX);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP3);
+                       d = codegen_reg_of_dst(jd, iptr, RDX);
+
+                       M_INTMOVE(s1, RAX);
                        M_INTMOVE(s2, REG_ITMP3);
-                       */
-                       if (checknull) {
-                               M_ITEST(REG_ITMP3);
-                               M_BEQ(0);
-                               codegen_add_arithmeticexception_ref(cd);
-                       }
+                       emit_arithmetic_check(cd, iptr, REG_ITMP3);
 
-                       M_MOV(RDX, REG_ITMP2); /* save %rdx, cause it's an argument register */
+                       M_MOV(RDX, REG_ITMP2);    /* save RDX (it's an argument register) */
 
                        /* check as described in jvm spec */
-                       disp = dseg_adds8(cd, 0x8000000000000000LL);
+                       disp = dseg_add_s8(cd, 0x8000000000000000LL);
                        M_LCMP_MEMBASE(RIP, -((cd->mcodeptr + 7) - cd->mcodebase) + disp, REG_ITMP1);
                        M_BNE(3 + 4 + 6);
-
-#if 0
-                       emit_alul_reg_reg(cd, ALU_XOR, RDX, RDX);         /* 2 bytes */
-#endif
                        M_LXOR(RDX, RDX);                                      /* 3 bytes */
-                       M_LCMP_IMM(-1, REG_ITMP3);                              /* 4 bytes */
+                       M_LCMP_IMM(-1, REG_ITMP3);                             /* 4 bytes */
                        M_BEQ(2 + 3);                                          /* 6 bytes */
 
-                       emit_cqto(cd);
-                       emit_idiv_reg(cd, REG_ITMP3);
-
-                       if (IS_INMEMORY(dst->flags)) {
-                               M_LST(RDX, REG_SP, dst->vv.regoff * 8);
-                               M_MOV(REG_ITMP2, RDX);                        /* restore %rdx */
-
-                       } else {
-                               M_INTMOVE(RDX, dst->vv.regoff);
+                       emit_cqto(cd);                                         /* 2 bytes */
+                       emit_idiv_reg(cd, REG_ITMP3);                          /* 3 bytes */
 
-                               if (dst->vv.regoff != RDX) {
-                                       M_MOV(REG_ITMP2, RDX);                    /* restore %rdx */
-                               }
-                       }
+                       M_INTMOVE(RDX, d);
+                       emit_store_dst(jd, iptr, d);
+                       dst = VAROP(iptr->dst);
+                       if (IS_INMEMORY(dst->flags) || (dst->vv.regoff != RDX))
+                               M_MOV(REG_ITMP2, RDX);                         /* restore RDX */
                        break;
 
                case ICMD_LDIVPOW2:   /* ..., value  ==> ..., value >> constant       */
@@ -1289,8 +941,8 @@ bool codegen(jitdata *jd)
 
                        s1 = emit_load_s1(jd, iptr, REG_FTMP1);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-                       disp = dseg_adds4(cd, 0x80000000);
-                       M_FLTMOVE(s1, d);
+                       disp = dseg_add_s4(cd, 0x80000000);
+                       emit_fmove(cd, s1, d);
                        emit_movss_membase_reg(cd, RIP, -((cd->mcodeptr + 9) - cd->mcodebase) + disp, REG_FTMP2);
                        emit_xorps_reg_reg(cd, REG_FTMP2, d);
                        emit_store_dst(jd, iptr, d);
@@ -1300,8 +952,8 @@ bool codegen(jitdata *jd)
 
                        s1 = emit_load_s1(jd, iptr, REG_FTMP1);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-                       disp = dseg_adds8(cd, 0x8000000000000000);
-                       M_FLTMOVE(s1, d);
+                       disp = dseg_add_s8(cd, 0x8000000000000000);
+                       emit_fmove(cd, s1, d);
                        emit_movd_membase_reg(cd, RIP, -((cd->mcodeptr + 9) - cd->mcodebase) + disp, REG_FTMP2);
                        emit_xorpd_reg_reg(cd, REG_FTMP2, d);
                        emit_store_dst(jd, iptr, d);
@@ -1315,7 +967,7 @@ bool codegen(jitdata *jd)
                        if (s2 == d)
                                M_FADD(s1, d);
                        else {
-                               M_FLTMOVE(s1, d);
+                               emit_fmove(cd, s1, d);
                                M_FADD(s2, d);
                        }
                        emit_store_dst(jd, iptr, d);
@@ -1329,7 +981,7 @@ bool codegen(jitdata *jd)
                        if (s2 == d)
                                M_DADD(s1, d);
                        else {
-                               M_FLTMOVE(s1, d);
+                               emit_fmove(cd, s1, d);
                                M_DADD(s2, d);
                        }
                        emit_store_dst(jd, iptr, d);
@@ -1341,10 +993,10 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_FTMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
                        if (s2 == d) {
-                               M_FLTMOVE(s2, REG_FTMP2);
+                               emit_fmove(cd, s2, REG_FTMP2);
                                s2 = REG_FTMP2;
                        }
-                       M_FLTMOVE(s1, d);
+                       emit_fmove(cd, s1, d);
                        M_FSUB(s2, d);
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1355,10 +1007,10 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_FTMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
                        if (s2 == d) {
-                               M_FLTMOVE(s2, REG_FTMP2);
+                               emit_fmove(cd, s2, REG_FTMP2);
                                s2 = REG_FTMP2;
                        }
-                       M_FLTMOVE(s1, d);
+                       emit_fmove(cd, s1, d);
                        M_DSUB(s2, d);
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1371,7 +1023,7 @@ bool codegen(jitdata *jd)
                        if (s2 == d)
                                M_FMUL(s1, d);
                        else {
-                               M_FLTMOVE(s1, d);
+                               emit_fmove(cd, s1, d);
                                M_FMUL(s2, d);
                        }
                        emit_store_dst(jd, iptr, d);
@@ -1385,7 +1037,7 @@ bool codegen(jitdata *jd)
                        if (s2 == d)
                                M_DMUL(s1, d);
                        else {
-                               M_FLTMOVE(s1, d);
+                               emit_fmove(cd, s1, d);
                                M_DMUL(s2, d);
                        }
                        emit_store_dst(jd, iptr, d);
@@ -1397,10 +1049,10 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_FTMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
                        if (s2 == d) {
-                               M_FLTMOVE(s2, REG_FTMP2);
+                               emit_fmove(cd, s2, REG_FTMP2);
                                s2 = REG_FTMP2;
                        }
-                       M_FLTMOVE(s1, d);
+                       emit_fmove(cd, s1, d);
                        M_FDIV(s2, d);
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1411,10 +1063,10 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_FTMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
                        if (s2 == d) {
-                               M_FLTMOVE(s2, REG_FTMP2);
+                               emit_fmove(cd, s2, REG_FTMP2);
                                s2 = REG_FTMP2;
                        }
-                       M_FLTMOVE(s1, d);
+                       emit_fmove(cd, s1, d);
                        M_DDIV(s2, d);
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1460,7 +1112,7 @@ bool codegen(jitdata *jd)
                        disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
                                ((REG_RESULT == d) ? 0 : 3);
                        M_BNE(disp);
-                       M_FLTMOVE(s1, REG_FTMP1);
+                       emit_fmove(cd, s1, REG_FTMP1);
                        M_MOV_IMM(asm_builtin_f2i, REG_ITMP2);
                        M_CALL(REG_ITMP2);
                        M_INTMOVE(REG_RESULT, d);
@@ -1476,7 +1128,7 @@ bool codegen(jitdata *jd)
                        disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
                                ((REG_RESULT == d) ? 0 : 3);
                        M_BNE(disp);
-                       M_FLTMOVE(s1, REG_FTMP1);
+                       emit_fmove(cd, s1, REG_FTMP1);
                        M_MOV_IMM(asm_builtin_d2i, REG_ITMP2);
                        M_CALL(REG_ITMP2);
                        M_INTMOVE(REG_RESULT, d);
@@ -1493,7 +1145,7 @@ bool codegen(jitdata *jd)
                        disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
                                ((REG_RESULT == d) ? 0 : 3);
                        M_BNE(disp);
-                       M_FLTMOVE(s1, REG_FTMP1);
+                       emit_fmove(cd, s1, REG_FTMP1);
                        M_MOV_IMM(asm_builtin_f2l, REG_ITMP2);
                        M_CALL(REG_ITMP2);
                        M_INTMOVE(REG_RESULT, d);
@@ -1510,7 +1162,7 @@ bool codegen(jitdata *jd)
                        disp = ((s1 == REG_FTMP1) ? 0 : 5) + 10 + 3 +
                                ((REG_RESULT == d) ? 0 : 3);
                        M_BNE(disp);
-                       M_FLTMOVE(s1, REG_FTMP1);
+                       emit_fmove(cd, s1, REG_FTMP1);
                        M_MOV_IMM(asm_builtin_d2l, REG_ITMP2);
                        M_CALL(REG_ITMP2);
                        M_INTMOVE(REG_RESULT, d);
@@ -1543,8 +1195,8 @@ bool codegen(jitdata *jd)
                        M_MOV_IMM(1, REG_ITMP1);
                        M_MOV_IMM(-1, REG_ITMP2);
                        emit_ucomiss_reg_reg(cd, s1, s2);
-                       M_CMOVB(REG_ITMP1, d);
-                       M_CMOVA(REG_ITMP2, d);
+                       M_CMOVULT(REG_ITMP1, d);
+                       M_CMOVUGT(REG_ITMP2, d);
                        M_CMOVP(REG_ITMP2, d);                   /* treat unordered as GT */
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1559,8 +1211,8 @@ bool codegen(jitdata *jd)
                        M_MOV_IMM(1, REG_ITMP1);
                        M_MOV_IMM(-1, REG_ITMP2);
                        emit_ucomiss_reg_reg(cd, s1, s2);
-                       M_CMOVB(REG_ITMP1, d);
-                       M_CMOVA(REG_ITMP2, d);
+                       M_CMOVULT(REG_ITMP1, d);
+                       M_CMOVUGT(REG_ITMP2, d);
                        M_CMOVP(REG_ITMP1, d);                   /* treat unordered as LT */
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1575,8 +1227,8 @@ bool codegen(jitdata *jd)
                        M_MOV_IMM(1, REG_ITMP1);
                        M_MOV_IMM(-1, REG_ITMP2);
                        emit_ucomisd_reg_reg(cd, s1, s2);
-                       M_CMOVB(REG_ITMP1, d);
-                       M_CMOVA(REG_ITMP2, d);
+                       M_CMOVULT(REG_ITMP1, d);
+                       M_CMOVUGT(REG_ITMP2, d);
                        M_CMOVP(REG_ITMP2, d);                   /* treat unordered as GT */
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1591,8 +1243,8 @@ bool codegen(jitdata *jd)
                        M_MOV_IMM(1, REG_ITMP1);
                        M_MOV_IMM(-1, REG_ITMP2);
                        emit_ucomisd_reg_reg(cd, s1, s2);
-                       M_CMOVB(REG_ITMP1, d);
-                       M_CMOVA(REG_ITMP2, d);
+                       M_CMOVULT(REG_ITMP1, d);
+                       M_CMOVUGT(REG_ITMP2, d);
                        M_CMOVP(REG_ITMP1, d);                   /* treat unordered as LT */
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1600,25 +1252,14 @@ bool codegen(jitdata *jd)
 
                /* memory operations **************************************************/
 
-               case ICMD_ARRAYLENGTH: /* ..., arrayref  ==> ..., (int) length        */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-                       gen_nullptr_check(s1);
-                       M_ILD(d, s1, OFFSET(java_arrayheader, size));
-                       emit_store_dst(jd, iptr, d);
-                       break;
-
                case ICMD_BALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movsbq_memindex_reg(cd, OFFSET(java_bytearray, data[0]), s1, s2, 0, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movsbq_memindex_reg(cd, OFFSET(java_bytearray_t, data[0]), s1, s2, 0, d);
                        emit_store_dst(jd, iptr, d);
                        break;
 
@@ -1627,11 +1268,9 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movzwq_memindex_reg(cd, OFFSET(java_chararray, data[0]), s1, s2, 1, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movzwq_memindex_reg(cd, OFFSET(java_chararray_t, data[0]), s1, s2, 1, d);
                        emit_store_dst(jd, iptr, d);
                        break;                  
 
@@ -1640,11 +1279,9 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movswq_memindex_reg(cd, OFFSET(java_shortarray, data[0]), s1, s2, 1, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movswq_memindex_reg(cd, OFFSET(java_shortarray_t, data[0]), s1, s2, 1, d);
                        emit_store_dst(jd, iptr, d);
                        break;
 
@@ -1653,11 +1290,9 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movl_memindex_reg(cd, OFFSET(java_intarray, data[0]), s1, s2, 2, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movl_memindex_reg(cd, OFFSET(java_intarray_t, data[0]), s1, s2, 2, d);
                        emit_store_dst(jd, iptr, d);
                        break;
 
@@ -1666,11 +1301,9 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_mov_memindex_reg(cd, OFFSET(java_longarray, data[0]), s1, s2, 3, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_mov_memindex_reg(cd, OFFSET(java_longarray_t, data[0]), s1, s2, 3, d);
                        emit_store_dst(jd, iptr, d);
                        break;
 
@@ -1679,11 +1312,9 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movss_memindex_reg(cd, OFFSET(java_floatarray, data[0]), s1, s2, 2, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movss_memindex_reg(cd, OFFSET(java_floatarray_t, data[0]), s1, s2, 2, d);
                        emit_store_dst(jd, iptr, d);
                        break;
 
@@ -1692,11 +1323,9 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movsd_memindex_reg(cd, OFFSET(java_doublearray, data[0]), s1, s2, 3, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movsd_memindex_reg(cd, OFFSET(java_doublearray_t, data[0]), s1, s2, 3, d);
                        emit_store_dst(jd, iptr, d);
                        break;
 
@@ -1705,11 +1334,9 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_mov_memindex_reg(cd, OFFSET(java_objectarray, data[0]), s1, s2, 3, d);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_mov_memindex_reg(cd, OFFSET(java_objectarray_t, data[0]), s1, s2, 3, d);
                        emit_store_dst(jd, iptr, d);
                        break;
 
@@ -1718,108 +1345,90 @@ bool codegen(jitdata *jd)
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
-                       emit_movb_reg_memindex(cd, s3, OFFSET(java_bytearray, data[0]), s1, s2, 0);
+                       emit_movb_reg_memindex(cd, s3, OFFSET(java_bytearray_t, data[0]), s1, s2, 0);
                        break;
 
                case ICMD_CASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
-                       emit_movw_reg_memindex(cd, s3, OFFSET(java_chararray, data[0]), s1, s2, 1);
+                       emit_movw_reg_memindex(cd, s3, OFFSET(java_chararray_t, data[0]), s1, s2, 1);
                        break;
 
                case ICMD_SASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
-                       emit_movw_reg_memindex(cd, s3, OFFSET(java_shortarray, data[0]), s1, s2, 1);
+                       emit_movw_reg_memindex(cd, s3, OFFSET(java_shortarray_t, data[0]), s1, s2, 1);
                        break;
 
                case ICMD_IASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
-                       emit_movl_reg_memindex(cd, s3, OFFSET(java_intarray, data[0]), s1, s2, 2);
+                       emit_movl_reg_memindex(cd, s3, OFFSET(java_intarray_t, data[0]), s1, s2, 2);
                        break;
 
                case ICMD_LASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
-                       emit_mov_reg_memindex(cd, s3, OFFSET(java_longarray, data[0]), s1, s2, 3);
+                       emit_mov_reg_memindex(cd, s3, OFFSET(java_longarray_t, data[0]), s1, s2, 3);
                        break;
 
                case ICMD_FASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_FTMP3);
-                       emit_movss_reg_memindex(cd, s3, OFFSET(java_floatarray, data[0]), s1, s2, 2);
+                       emit_movss_reg_memindex(cd, s3, OFFSET(java_floatarray_t, data[0]), s1, s2, 2);
                        break;
 
                case ICMD_DASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_FTMP3);
-                       emit_movsd_reg_memindex(cd, s3, OFFSET(java_doublearray, data[0]), s1, s2, 3);
+                       emit_movsd_reg_memindex(cd, s3, OFFSET(java_doublearray_t, data[0]), s1, s2, 3);
                        break;
 
                case ICMD_AASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
 
                        M_MOV(s1, REG_A0);
                        M_MOV(s3, REG_A1);
-                       M_MOV_IMM(BUILTIN_canstore, REG_ITMP1);
+                       M_MOV_IMM(BUILTIN_FAST_canstore, REG_ITMP1);
                        M_CALL(REG_ITMP1);
-                       M_TEST(REG_RESULT);
-                       M_BEQ(0);
-                       codegen_add_arraystoreexception_ref(cd);
+                       emit_arraystore_check(cd, iptr);
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
-                       emit_mov_reg_memindex(cd, s3, OFFSET(java_objectarray, data[0]), s1, s2, 3);
+                       emit_mov_reg_memindex(cd, s3, OFFSET(java_objectarray_t, data[0]), s1, s2, 3);
                        break;
 
 
@@ -1827,211 +1436,61 @@ bool codegen(jitdata *jd)
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movb_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_bytearray, data[0]), s1, s2, 0);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movb_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_bytearray_t, data[0]), s1, s2, 0);
                        break;
 
                case ICMD_CASTORECONST:   /* ..., arrayref, index  ==> ...            */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movw_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_chararray, data[0]), s1, s2, 1);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movw_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_chararray_t, data[0]), s1, s2, 1);
                        break;
 
                case ICMD_SASTORECONST:   /* ..., arrayref, index  ==> ...            */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movw_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_shortarray, data[0]), s1, s2, 1);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movw_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_shortarray_t, data[0]), s1, s2, 1);
                        break;
 
                case ICMD_IASTORECONST: /* ..., arrayref, index  ==> ...              */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_movl_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_intarray, data[0]), s1, s2, 2);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_movl_imm_memindex(cd, iptr->sx.s23.s3.constval, OFFSET(java_intarray_t, data[0]), s1, s2, 2);
                        break;
 
                case ICMD_LASTORECONST: /* ..., arrayref, index  ==> ...              */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
 
                        if (IS_IMM32(iptr->sx.s23.s3.constval)) {
-                               emit_mov_imm_memindex(cd, (u4) (iptr->sx.s23.s3.constval & 0x00000000ffffffff), OFFSET(java_longarray, data[0]), s1, s2, 3);
-                       } else {
-                               emit_movl_imm_memindex(cd, (u4) (iptr->sx.s23.s3.constval & 0x00000000ffffffff), OFFSET(java_longarray, data[0]), s1, s2, 3);
-                               emit_movl_imm_memindex(cd, (u4) (iptr->sx.s23.s3.constval >> 32), OFFSET(java_longarray, data[0]) + 4, s1, s2, 3);
-                       }
-                       break;
-
-               case ICMD_AASTORECONST: /* ..., arrayref, index  ==> ...              */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                       }
-                       emit_mov_imm_memindex(cd, 0, OFFSET(java_objectarray, data[0]), s1, s2, 3);
-                       break;
-
-
-               case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
-
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uf        = iptr->sx.s23.s3.uf;
-                               fieldtype = uf->fieldref->parseddesc.fd->type;
-                               disp      = dseg_addaddress(cd, NULL);
-                               disp      = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
-
-                               /* must be calculated before codegen_addpatchref */
-
-                               if (opt_showdisassemble)
-                                       disp -= PATCHER_CALL_SIZE;
-
-/*                             PROFILE_CYCLE_STOP; */
-
-                               codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
-
-/*                             PROFILE_CYCLE_START; */
+                               emit_mov_imm_memindex(cd, (u4) (iptr->sx.s23.s3.constval & 0x00000000ffffffff), OFFSET(java_longarray_t, data[0]), s1, s2, 3);
                        }
                        else {
-                               fi        = iptr->sx.s23.s3.fmiref->p.field;
-                               fieldtype = fi->type;
-                               disp      = dseg_addaddress(cd, &(fi->value));
-                               disp      = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
-
-                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
-                                       PROFILE_CYCLE_STOP;
-
-                                       codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
-
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
-
-                                       PROFILE_CYCLE_START;
-                               }
-                       }
-
-                       /* This approach is much faster than moving the field
-                          address inline into a register. */
-
-                       M_ALD(REG_ITMP1, RIP, disp);
-
-                       switch (fieldtype) {
-                       case TYPE_INT:
-                               d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
-                               M_ILD(d, REG_ITMP1, 0);
-                               break;
-                       case TYPE_LNG:
-                       case TYPE_ADR:
-                               d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
-                               M_LLD(d, REG_ITMP1, 0);
-                               break;
-                       case TYPE_FLT:
-                               d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
-                               M_FLD(d, REG_ITMP1, 0);
-                               break;
-                       case TYPE_DBL:                          
-                               d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
-                               M_DLD(d, REG_ITMP1, 0);
-                               break;
+                               emit_movl_imm_memindex(cd, (u4) (iptr->sx.s23.s3.constval & 0x00000000ffffffff), OFFSET(java_longarray_t, data[0]), s1, s2, 3);
+                               emit_movl_imm_memindex(cd, (u4) (iptr->sx.s23.s3.constval >> 32), OFFSET(java_longarray_t, data[0]) + 4, s1, s2, 3);
                        }
-                       emit_store_dst(jd, iptr, d);
                        break;
 
-               case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
-
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uf        = iptr->sx.s23.s3.uf;
-                               fieldtype = uf->fieldref->parseddesc.fd->type;
-                               disp      = dseg_addaddress(cd, NULL);
-                               disp      = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
-
-                               /* must be calculated before codegen_addpatchref */
-
-                               if (opt_showdisassemble)
-                                       disp -= PATCHER_CALL_SIZE;
-
-/*                             PROFILE_CYCLE_STOP; */
-
-                               codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
-
-/*                             PROFILE_CYCLE_START; */
-                       }
-                       else {
-                               fi        = iptr->sx.s23.s3.fmiref->p.field;
-                               fieldtype = fi->type;
-                               disp      = dseg_addaddress(cd, &(fi->value));
-                               disp      = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
-
-                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
-                                       PROFILE_CYCLE_STOP;
-
-                                       codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
-
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                               disp -= PATCHER_CALL_SIZE;
-                                       }
-
-                                       PROFILE_CYCLE_START;
-                               }
-                       }
-
-                       /* This approach is much faster than moving the field
-                          address inline into a register. */
-
-                       M_ALD(REG_ITMP1, RIP, disp);
+               case ICMD_AASTORECONST: /* ..., arrayref, index  ==> ...              */
 
-                       switch (fieldtype) {
-                       case TYPE_INT:
-                               s1 = emit_load_s1(jd, iptr, REG_ITMP2);
-                               M_IST(s1, REG_ITMP1, 0);
-                               break;
-                       case TYPE_LNG:
-                       case TYPE_ADR:
-                               s1 = emit_load_s1(jd, iptr, REG_ITMP2);
-                               M_LST(s1, REG_ITMP1, 0);
-                               break;
-                       case TYPE_FLT:
-                               s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                               M_FST(s1, REG_ITMP1, 0);
-                               break;
-                       case TYPE_DBL:
-                               s1 = emit_load_s1(jd, iptr, REG_FTMP1);
-                               M_DST(s1, REG_ITMP1, 0);
-                               break;
-                       }
+                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
+                       /* implicit null-pointer check */
+                       emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
+                       emit_mov_imm_memindex(cd, 0, OFFSET(java_objectarray_t, data[0]), s1, s2, 3);
                        break;
 
                case ICMD_PUTSTATICCONST: /* ...  ==> ...                             */
@@ -2041,42 +1500,31 @@ bool codegen(jitdata *jd)
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
                                uf        = iptr->sx.s23.s3.uf;
                                fieldtype = uf->fieldref->parseddesc.fd->type;
-                               disp      = dseg_addaddress(cd, NULL);
-                               disp      = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
-
-                               /* must be calculated before codegen_addpatchref */
-
-                               if (opt_showdisassemble)
-                                       disp -= PATCHER_CALL_SIZE;
-
+                               disp      = dseg_add_unique_address(cd, uf);
 
 /*                             PROFILE_CYCLE_STOP; */
 
-                               codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
+                               pr = patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
 
 /*                             PROFILE_CYCLE_START; */
+
+                               fi = NULL;              /* Silence compiler warning */
                        }
                        else {
                                fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
-                               disp      = dseg_addaddress(cd, &(fi->value));
-                               disp      = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
+                               disp      = dseg_add_address(cd, fi->value);
 
-                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
-                                       PROFILE_CYCLE_STOP;
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) {
+                                       //PROFILE_CYCLE_STOP;
 
-                                       codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
+                                       patcher_add_patch_ref(jd, PATCHER_initialize_class,
+                                                                                 fi->clazz, 0);
 
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
-
-                                       PROFILE_CYCLE_START;
+                                       //PROFILE_CYCLE_START;
                                }
+
+                               pr = NULL;              /* Silence compiler warning */
                        }
 
                        /* This approach is much faster than moving the field
@@ -2095,17 +1543,17 @@ bool codegen(jitdata *jd)
                                if (IS_IMM32(iptr->sx.s23.s2.constval))
                                        M_LST_IMM32(iptr->sx.s23.s2.constval, REG_ITMP1, 0);
                                else {
-                                       M_IST_IMM(iptr->sx.s23.s2.constval, REG_ITMP1, 0);
-                                       M_IST_IMM(iptr->sx.s23.s2.constval >> 32, REG_ITMP1, 4);
+                                       M_MOV_IMM(iptr->sx.s23.s2.constval, REG_ITMP2);
+                                       M_LST(REG_ITMP2, REG_ITMP1, 0);
                                }
                                break;
                        }
+                       codegen_emit_patchable_barrier(iptr, cd, pr, fi);
                        break;
 
                case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       gen_nullptr_check(s1);
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
                                uf        = iptr->sx.s23.s3.uf;
@@ -2114,13 +1562,11 @@ bool codegen(jitdata *jd)
 
 /*                             PROFILE_CYCLE_STOP; */
 
-                               codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
+                               patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
 
 /*                             PROFILE_CYCLE_START; */
+
+                               fi = NULL;              /* Silence compiler warning */
                        }
                        else {
                                fi        = iptr->sx.s23.s3.fmiref->p.field;
@@ -2128,6 +1574,7 @@ bool codegen(jitdata *jd)
                                disp      = fi->offset;
                        }
 
+                       /* implicit null-pointer check */
                        switch (fieldtype) {
                        case TYPE_INT:
                                d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
@@ -2146,6 +1593,9 @@ bool codegen(jitdata *jd)
                                d = codegen_reg_of_dst(jd, iptr, REG_FTMP1);
                                M_DLD32(d, s1, disp);
                                break;
+                       default:
+                               // Silence compiler warning.
+                               d = 0;
                        }
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -2153,9 +1603,7 @@ bool codegen(jitdata *jd)
                case ICMD_PUTFIELD:   /* ..., objectref, value  ==> ...               */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       gen_nullptr_check(s1);
-
-                       s2 = emit_load_s2(jd, iptr, REG_IFTMP);
+                       s2 = emit_load_s2(jd, iptr, REG_IFTMP); /* REG_IFTMP == REG_ITMP2 */
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
                                uf        = iptr->sx.s23.s3.uf;
@@ -2164,20 +1612,21 @@ bool codegen(jitdata *jd)
 
 /*                             PROFILE_CYCLE_STOP; */
 
-                               codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
+                               pr = patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
 
 /*                             PROFILE_CYCLE_START; */
+
+                               fi = NULL;              /* Silence compiler warning */
                        } 
                        else {
                                fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
                                disp      = fi->offset;
+
+                               pr = NULL;              /* Silence compiler warning */
                        }
 
+                       /* implicit null-pointer check */
                        switch (fieldtype) {
                        case TYPE_INT:
                                M_IST32(s2, s1, disp);
@@ -2193,6 +1642,7 @@ bool codegen(jitdata *jd)
                                M_DST32(s2, s1, disp);
                                break;
                        }
+                       codegen_emit_patchable_barrier(iptr, cd, pr, fi);
                        break;
 
                case ICMD_PUTFIELDCONST:  /* ..., objectref, value  ==> ...           */
@@ -2200,7 +1650,6 @@ bool codegen(jitdata *jd)
                                          /* following NOP)                           */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       gen_nullptr_check(s1);
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
                                uf        = iptr->sx.s23.s3.uf;
@@ -2209,20 +1658,21 @@ bool codegen(jitdata *jd)
 
 /*                             PROFILE_CYCLE_STOP; */
 
-                               codegen_addpatchref(cd, PATCHER_putfieldconst, uf, 0);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
+                               pr = patcher_add_patch_ref(jd, PATCHER_putfieldconst, uf, 0);
 
 /*                             PROFILE_CYCLE_START; */
+
+                               fi = NULL;              /* Silence compiler warning */
                        } 
                        else {
                                fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
                                disp      = fi->offset;
+
+                               pr = NULL;              /* Silence compiler warning */
                        }
 
+                       /* implicit null-pointer check */
                        switch (fieldtype) {
                        case TYPE_INT:
                        case TYPE_FLT:
@@ -2231,11 +1681,15 @@ bool codegen(jitdata *jd)
                        case TYPE_LNG:
                        case TYPE_ADR:
                        case TYPE_DBL:
-                               /* XXX why no check for IS_IMM32? */
-                               M_IST32_IMM(iptr->sx.s23.s2.constval, s1, disp);
-                               M_IST32_IMM(iptr->sx.s23.s2.constval >> 32, s1, disp + 4);
+                               /* XXX why no check for IS_IMM32? -- probably because of the patcher */
+                               M_MOV_IMM(iptr->sx.s23.s2.constval, REG_ITMP2);
+                               if (disp)  /* resolved, disp can never be 0 */
+                                       M_LST(REG_ITMP2, s1, disp);
+                               else       /* unresolved */
+                                       M_LST32(REG_ITMP2, s1, disp);
                                break;
                        }
+                       codegen_emit_patchable_barrier(iptr, cd, pr, fi);
                        break;
 
 
@@ -2243,22 +1697,6 @@ bool codegen(jitdata *jd)
 
                case ICMD_ATHROW:       /* ..., objectref ==> ... (, objectref)       */
 
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_INTMOVE(s1, REG_ITMP1_XPTR);
-
-                       PROFILE_CYCLE_STOP;
-
-#ifdef ENABLE_VERIFIER
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               codegen_addpatchref(cd, PATCHER_athrow_areturn,
-                                                                       iptr->sx.s23.s2.uc, 0);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
-                       }
-#endif /* ENABLE_VERIFIER */
-
                        M_CALL_IMM(0);                            /* passing exception pc */
                        M_POP(REG_ITMP2_XPC);
 
@@ -2266,84 +1704,12 @@ bool codegen(jitdata *jd)
                        M_JMP(REG_ITMP3);
                        break;
 
-               case ICMD_GOTO:         /* ... ==> ...                                */
-               case ICMD_RET:          /* ... ==> ...                                */
-
-                       M_JMP_IMM(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_JSR:          /* ... ==> ...                                */
-
-                       M_JMP_IMM(0);
-                       codegen_addreference(cd, iptr->sx.s23.s3.jsrtarget.block);
-                       break;
-                       
-               case ICMD_IFNULL:       /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_TEST(s1);
-                       M_BEQ(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IFNONNULL:    /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_TEST(s1);
-                       M_BNE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IFEQ:         /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_ICMP_IMM(iptr->sx.val.i, s1);
-                       M_BEQ(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IFLT:         /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_ICMP_IMM(iptr->sx.val.i, s1);
-                       M_BLT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IFLE:         /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_ICMP_IMM(iptr->sx.val.i, s1);
-                       M_BLE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IFNE:         /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_ICMP_IMM(iptr->sx.val.i, s1);
-                       M_BNE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IFGT:         /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_ICMP_IMM(iptr->sx.val.i, s1);
-                       M_BGT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IFGE:         /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       M_ICMP_IMM(iptr->sx.val.i, s1);
-                       M_BGE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
                case ICMD_IF_LEQ:       /* ..., value ==> ...                         */
+               case ICMD_IF_LNE:
+               case ICMD_IF_LLT:
+               case ICMD_IF_LGE:
+               case ICMD_IF_LGT:
+               case ICMD_IF_LLE:
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        if (IS_IMM32(iptr->sx.val.l))
@@ -2352,291 +1718,22 @@ bool codegen(jitdata *jd)
                                M_MOV_IMM(iptr->sx.val.l, REG_ITMP2);
                                M_LCMP(REG_ITMP2, s1);
                        }
-                       M_BEQ(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LLT:       /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       if (IS_IMM32(iptr->sx.val.l))
-                               M_LCMP_IMM(iptr->sx.val.l, s1);
-                       else {
-                               M_MOV_IMM(iptr->sx.val.l, REG_ITMP2);
-                               M_LCMP(REG_ITMP2, s1);
-                       }
-                       M_BLT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LLE:       /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       if (IS_IMM32(iptr->sx.val.l))
-                               M_LCMP_IMM(iptr->sx.val.l, s1);
-                       else {
-                               M_MOV_IMM(iptr->sx.val.l, REG_ITMP2);
-                               M_LCMP(REG_ITMP2, s1);
-                       }
-                       M_BLE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LNE:       /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       if (IS_IMM32(iptr->sx.val.l))
-                               M_LCMP_IMM(iptr->sx.val.l, s1);
-                       else {
-                               M_MOV_IMM(iptr->sx.val.l, REG_ITMP2);
-                               M_LCMP(REG_ITMP2, s1);
-                       }
-                       M_BNE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LGT:       /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       if (IS_IMM32(iptr->sx.val.l))
-                               M_LCMP_IMM(iptr->sx.val.l, s1);
-                       else {
-                               M_MOV_IMM(iptr->sx.val.l, REG_ITMP2);
-                               M_LCMP(REG_ITMP2, s1);
-                       }
-                       M_BGT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LGE:       /* ..., value ==> ...                         */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       if (IS_IMM32(iptr->sx.val.l))
-                               M_LCMP_IMM(iptr->sx.val.l, s1);
-                       else {
-                               M_MOV_IMM(iptr->sx.val.l, REG_ITMP2);
-                               M_LCMP(REG_ITMP2, s1);
-                       }
-                       M_BGE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_ICMPEQ:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_ICMP(s2, s1);
-                       M_BEQ(0);
-                       codegen_addreference(cd, iptr->dst.block);
+                       emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_LEQ, BRANCH_OPT_NONE);
                        break;
 
                case ICMD_IF_LCMPEQ:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_ACMPEQ:    /* op1 = target JavaVM pc                     */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_LCMP(s2, s1);
-                       M_BEQ(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_ICMPNE:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_ICMP(s2, s1);
-                       M_BNE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LCMPNE:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_ACMPNE:    /* op1 = target JavaVM pc                     */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_LCMP(s2, s1);
-                       M_BNE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_ICMPLT:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_ICMP(s2, s1);
-                       M_BLT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LCMPLT:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_LCMP(s2, s1);
-                       M_BLT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_ICMPGT:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_ICMP(s2, s1);
-                       M_BGT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LCMPGT:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_LCMP(s2, s1);
-                       M_BGT(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_ICMPLE:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_ICMP(s2, s1);
-                       M_BLE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LCMPLE:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_LCMP(s2, s1);
-                       M_BLE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_ICMPGE:    /* ..., value, value ==> ...                  */
-
-                       s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-                       M_ICMP(s2, s1);
-                       M_BGE(0);
-                       codegen_addreference(cd, iptr->dst.block);
-                       break;
-
-               case ICMD_IF_LCMPGE:    /* ..., value, value ==> ...                  */
+               case ICMD_IF_LCMPNE:
+               case ICMD_IF_LCMPLT:
+               case ICMD_IF_LCMPGE:
+               case ICMD_IF_LCMPGT:
+               case ICMD_IF_LCMPLE:
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        M_LCMP(s2, s1);
-                       M_BGE(0);
-                       codegen_addreference(cd, iptr->dst.block);
+                       emit_bcc(cd, iptr->dst.block, iptr->opc - ICMD_IF_LCMPEQ, BRANCH_OPT_NONE);
                        break;
 
-               case ICMD_IRETURN:      /* ..., retvalue ==> ...                      */
-               case ICMD_LRETURN:
-
-                       s1 = emit_load_s1(jd, iptr, REG_RESULT);
-                       M_INTMOVE(s1, REG_RESULT);
-                       goto nowperformreturn;
-
-               case ICMD_ARETURN:      /* ..., retvalue ==> ...                      */
-
-                       s1 = emit_load_s1(jd, iptr, REG_RESULT);
-                       M_INTMOVE(s1, REG_RESULT);
-
-#ifdef ENABLE_VERIFIER
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               PROFILE_CYCLE_STOP;
-
-                               codegen_addpatchref(cd, PATCHER_athrow_areturn,
-                                                                       iptr->sx.s23.s2.uc, 0);
-
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
-
-                               PROFILE_CYCLE_START;
-                       }
-#endif /* ENABLE_VERIFIER */
-                       goto nowperformreturn;
-
-               case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
-               case ICMD_DRETURN:
-
-                       s1 = emit_load_s1(jd, iptr, REG_FRESULT);
-                       M_FLTMOVE(s1, REG_FRESULT);
-                       goto nowperformreturn;
-
-               case ICMD_RETURN:      /* ...  ==> ...                                */
-
-nowperformreturn:
-                       {
-                       s4 i, p;
-
-                       p = cd->stackframesize;
-
-#if !defined(NDEBUG)
-                       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-                               emit_verbosecall_exit(jd);
-#endif /* !defined(NDEBUG) */
-
-#if defined(ENABLE_THREADS)
-                       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
-                               M_ALD(REG_A0, REG_SP, rd->memuse * 8);
-       
-                               /* we need to save the proper return value */
-                               switch (iptr->opc) {
-                               case ICMD_IRETURN:
-                               case ICMD_ARETURN:
-                               case ICMD_LRETURN:
-                                       M_LST(REG_RESULT, REG_SP, rd->memuse * 8);
-                                       break;
-                               case ICMD_FRETURN:
-                               case ICMD_DRETURN:
-                                       M_DST(REG_FRESULT, REG_SP, rd->memuse * 8);
-                                       break;
-                               }
-
-                               M_MOV_IMM(LOCK_monitor_exit, REG_ITMP1);
-                               M_CALL(REG_ITMP1);
-
-                               /* and now restore the proper return value */
-                               switch (iptr->opc) {
-                               case ICMD_IRETURN:
-                               case ICMD_ARETURN:
-                               case ICMD_LRETURN:
-                                       M_LLD(REG_RESULT, REG_SP, rd->memuse * 8);
-                                       break;
-                               case ICMD_FRETURN:
-                               case ICMD_DRETURN:
-                                       M_DLD(REG_FRESULT, REG_SP, rd->memuse * 8);
-                                       break;
-                               }
-                       }
-#endif
-
-                       /* restore saved registers */
-
-                       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
-                               p--; M_LLD(rd->savintregs[i], REG_SP, p * 8);
-                       }
-                       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
-                               p--; M_DLD(rd->savfltregs[i], REG_SP, p * 8);
-                       }
-
-                       /* deallocate stack */
-
-                       if (cd->stackframesize)
-                               M_AADD_IMM(cd->stackframesize * 8, REG_SP);
-
-                       /* generate method profiling code */
-
-                       PROFILE_CYCLE_STOP;
-
-                       M_RET;
-                       }
-                       break;
-
-
                case ICMD_TABLESWITCH:  /* ..., index ==> ...                         */
                        {
                                s4 i, l;
@@ -2654,346 +1751,137 @@ nowperformreturn:
                                        M_ISUB_IMM(l, REG_ITMP1);
 
                                /* number of targets */
-                               i = i - l + 1;
-
-                /* range check */
-                               M_ICMP_IMM(i - 1, REG_ITMP1);
-                               M_BA(0);
-
-                               codegen_addreference(cd, table[0].block); /* default target */
-
-                               /* build jump table top down and use address of lowest entry */
-
-                               table += i;
-
-                               while (--i >= 0) {
-                                       dseg_addtarget(cd, table->block);
-                                       --table;
-                               }
-
-                               /* length of dataseg after last dseg_addtarget is used
-                                  by load */
-
-                               M_MOV_IMM(0, REG_ITMP2);
-                               dseg_adddata(cd);
-                               emit_mov_memindex_reg(cd, -(cd->dseglen), REG_ITMP2, REG_ITMP1, 3, REG_ITMP1);
-                               M_JMP(REG_ITMP1);
-                       }
-                       break;
-
-
-               case ICMD_LOOKUPSWITCH: /* ..., key ==> ...                           */
-                       {
-                               s4 i;
-                               lookup_target_t *lookup;
-
-                               lookup = iptr->dst.lookup;
-
-                               i = iptr->sx.s23.s2.lookupcount;
-                       
-                               MCODECHECK(8 + ((7 + 6) * i) + 5);
-                               s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-
-                               while (--i >= 0) {
-                                       M_ICMP_IMM(lookup->value, s1);
-                                       M_BEQ(0);
-                                       codegen_addreference(cd, lookup->target.block);
-                                       lookup++;
-                               }
-
-                               M_JMP_IMM(0);
-                       
-                               codegen_addreference(cd, iptr->sx.s23.s3.lookupdefault.block);
-                       }
-                       break;
-
-
-               case ICMD_BUILTIN:      /* ..., [arg1, [arg2 ...]] ==> ...            */
-
-                       bte = iptr->sx.s23.s3.bte;
-                       md  = bte->md;
-                       goto gen_method;
-
-               case ICMD_INVOKESTATIC: /* ..., [arg1, [arg2 ...]] ==> ...            */
-
-               case ICMD_INVOKESPECIAL:/* ..., objectref, [arg1, [arg2 ...]] ==> ... */
-               case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer    */
-               case ICMD_INVOKEINTERFACE:
-
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               lm = NULL;
-                               um = iptr->sx.s23.s3.um;
-                               md = um->methodref->parseddesc.md;
-                       }
-                       else {
-                               lm = iptr->sx.s23.s3.fmiref->p.method;
-                               um = NULL;
-                               md = lm->parseddesc;
-                       }
-
-gen_method:
-                       s3 = md->paramcount;
-
-                       MCODECHECK((20 * s3) + 128);
-
-                       /* copy arguments to registers or stack location */
-
-                       for (s3 = s3 - 1; s3 >= 0; s3--) {
-                               var = VAR(iptr->sx.s23.s2.args[s3]);
-
-                               /* Already Preallocated (ARGVAR) ? */
-                               if (var->flags & PREALLOC)
-                                       continue;
-
-                               if (IS_INT_LNG_TYPE(var->type)) {
-                                       if (!md->params[s3].inmemory) {
-                                               s1 = rd->argintregs[md->params[s3].regoff];
-                                               d = emit_load(jd, iptr, var, s1);
-                                               M_INTMOVE(d, s1);
-                                       }
-                                       else {
-                                               d = emit_load(jd, iptr, var, REG_ITMP1);
-                                               M_LST(d, REG_SP, md->params[s3].regoff * 8);
-                                       }
-                               }
-                               else {
-                                       if (!md->params[s3].inmemory) {
-                                               s1 = rd->argfltregs[md->params[s3].regoff];
-                                               d = emit_load(jd, iptr, var, s1);
-                                               M_FLTMOVE(d, s1);
-                                       }
-                                       else {
-                                               d = emit_load(jd, iptr, var, REG_FTMP1);
-
-                                               if (IS_2_WORD_TYPE(var->type))
-                                                       M_DST(d, REG_SP, md->params[s3].regoff * 8);
-                                               else
-                                                       M_FST(d, REG_SP, md->params[s3].regoff * 8);
-                                       }
-                               }
-                       }
-
-                       /* generate method profiling code */
-
-                       PROFILE_CYCLE_STOP;
-
-                       switch (iptr->opc) {
-                       case ICMD_BUILTIN:
-                               M_MOV_IMM(bte->fp, REG_ITMP1);
-                               M_CALL(REG_ITMP1);
-
-                               if (INSTRUCTION_MUST_CHECK(iptr)) {
-                                       M_TEST(REG_RESULT);
-                                       M_BEQ(0);
-                                       codegen_add_fillinstacktrace_ref(cd);
-                               }
-                               break;
-
-                       case ICMD_INVOKESPECIAL:
-                               M_TEST(REG_A0);
-                               M_BEQ(0);
-                               codegen_add_nullpointerexception_ref(cd);
-
-                               /* fall through */
-
-                       case ICMD_INVOKESTATIC:
-                               if (lm == NULL) {
-                                       disp = dseg_addaddress(cd, NULL);
-                                       disp = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
-
-                                       /* must be calculated before codegen_addpatchref */
-
-                                       if (opt_showdisassemble)
-                                               disp -= PATCHER_CALL_SIZE;
-
-                                       codegen_addpatchref(cd, PATCHER_invokestatic_special,
-                                                                               um, disp);
-
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
-
-/*                                     a = 0; */
-                               }
-                               else {
-                                       disp = dseg_addaddress(cd, lm->stubroutine);
-                                       disp = -((cd->mcodeptr + 7) - cd->mcodebase) + disp;
-
-/*                                     a = (ptrint) lm->stubroutine; */
-                               }
+                               i = i - l + 1;
 
-/*                             M_MOV_IMM(a, REG_ITMP2); */
-                               M_ALD(REG_ITMP2, RIP, disp);
-                               M_CALL(REG_ITMP2);
-                               break;
+                /* range check */
 
-                       case ICMD_INVOKEVIRTUAL:
-                               gen_nullptr_check(REG_A0);
+                               M_ICMP_IMM(i - 1, REG_ITMP1);
+                               emit_bugt(cd, table[0].block);
 
-                               if (lm == NULL) {
-                                       codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
+                               /* build jump table top down and use address of lowest entry */
 
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
+                               table += i;
 
-                                       s1 = 0;
+                               while (--i >= 0) {
+                                       dseg_add_target(cd, table->block);
+                                       --table;
                                }
-                               else
-                                       s1 = OFFSET(vftbl_t, table[0]) +
-                                               sizeof(methodptr) * lm->vftblindex;
-
-                               M_ALD(REG_METHODPTR, REG_A0,
-                                         OFFSET(java_objectheader, vftbl));
-                               M_ALD32(REG_ITMP3, REG_METHODPTR, s1);
-                               M_CALL(REG_ITMP3);
-                               break;
 
-                       case ICMD_INVOKEINTERFACE:
-                               gen_nullptr_check(REG_A0);
+                               /* length of dataseg after last dseg_add_target is used
+                                  by load */
 
-                               if (lm == NULL) {
-                                       codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
+                               M_MOV_IMM(0, REG_ITMP2);
+                               dseg_adddata(cd);
+                               emit_mov_memindex_reg(cd, -(cd->dseglen), REG_ITMP2, REG_ITMP1, 3, REG_ITMP1);
+                               M_JMP(REG_ITMP1);
+                       }
+                       break;
 
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
+               case ICMD_BUILTIN:
+                       bte = iptr->sx.s23.s3.bte;
+                       if (bte->stub == NULL) {
+                               M_MOV_IMM(bte->fp, REG_ITMP1);
+                       }
+                       else {
+                               M_MOV_IMM(bte->stub, REG_ITMP1);
+                       }
+                       M_CALL(REG_ITMP1);
+                       break;
 
-                                       s1 = 0;
-                                       s2 = 0;
-                               }
-                               else {
-                                       s1 = OFFSET(vftbl_t, interfacetable[0]) -
-                                               sizeof(methodptr) * lm->class->index;
+               case ICMD_INVOKESPECIAL:
+                       emit_nullpointer_check(cd, iptr, REG_A0);
+                       /* fall through */
 
-                                       s2 = sizeof(methodptr) * (lm - lm->class->methods);
-                               }
+               case ICMD_INVOKESTATIC:
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               um = iptr->sx.s23.s3.um;
+                               disp = dseg_add_unique_address(cd, um);
 
-                               M_ALD(REG_METHODPTR, REG_A0,
-                                         OFFSET(java_objectheader, vftbl));
-                               M_ALD32(REG_METHODPTR, REG_METHODPTR, s1);
-                               M_ALD32(REG_ITMP3, REG_METHODPTR, s2);
-                               M_CALL(REG_ITMP3);
-                               break;
+                               patcher_add_patch_ref(jd, PATCHER_invokestatic_special,
+                                                                         um, disp);
+                       }
+                       else {
+                               lm = iptr->sx.s23.s3.fmiref->p.method;
+                               disp = dseg_add_functionptr(cd, lm->stubroutine);
                        }
 
-                       /* generate method profiling code */
+                       M_ALD(REG_ITMP2, RIP, disp);
+                       M_CALL(REG_ITMP2);
+                       break;
 
-                       PROFILE_CYCLE_START;
+               case ICMD_INVOKEVIRTUAL:
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               um = iptr->sx.s23.s3.um;
+                               patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0);
 
-                       /* store return value */
+                               s1 = 0;
+                       }
+                       else {
+                               lm = iptr->sx.s23.s3.fmiref->p.method;
+                               s1 = OFFSET(vftbl_t, table[0]) +
+                                       sizeof(methodptr) * lm->vftblindex;
+                       }
 
-                       d = md->returntype.type;
+                       /* implicit null-pointer check */
+                       M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
+                       M_ALD32(REG_ITMP3, REG_METHODPTR, s1);
+                       M_CALL(REG_ITMP3);
+                       break;
 
-                       if (d != TYPE_VOID) {
-                               if (IS_INT_LNG_TYPE(d)) {
-                                       s1 = codegen_reg_of_dst(jd, iptr, REG_RESULT);
-                                       M_INTMOVE(REG_RESULT, s1);
-                               }
-                               else {
-                                       s1 = codegen_reg_of_dst(jd, iptr, REG_FRESULT);
-                                       M_FLTMOVE(REG_FRESULT, s1);
-                               }
-                               emit_store_dst(jd, iptr, s1);
+               case ICMD_INVOKEINTERFACE:
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               um = iptr->sx.s23.s3.um;
+                               patcher_add_patch_ref(jd, PATCHER_invokeinterface, um, 0);
+
+                               s1 = 0;
+                               s2 = 0;
+                       }
+                       else {
+                               lm = iptr->sx.s23.s3.fmiref->p.method;
+                               s1 = OFFSET(vftbl_t, interfacetable[0]) -
+                                       sizeof(methodptr) * lm->clazz->index;
+
+                               s2 = sizeof(methodptr) * (lm - lm->clazz->methods);
                        }
-                       break;
 
+                       /* implicit null-pointer check */
+                       M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
+                       M_ALD32(REG_METHODPTR, REG_METHODPTR, s1);
+                       M_ALD32(REG_ITMP3, REG_METHODPTR, s2);
+                       M_CALL(REG_ITMP3);
+                       break;
 
                case ICMD_CHECKCAST:  /* ..., objectref ==> ..., objectref            */
 
-                                     /* val.a: (classinfo *) superclass              */
-
-                       /*  superclass is an interface:
-                        *      
-                        *  OK if ((sub == NULL) ||
-                        *         (sub->vftbl->interfacetablelength > super->index) &&
-                        *         (sub->vftbl->interfacetable[-super->index] != NULL));
-                        *      
-                        *  superclass is a class:
-                        *      
-                        *  OK if ((sub == NULL) || (0
-                        *         <= (sub->vftbl->baseval - super->vftbl->baseval) <=
-                        *         super->vftbl->diffval));
-                        */
-
                        if (!(iptr->flags.bits & INS_FLAG_ARRAY)) {
                                /* object type cast-check */
 
                                classinfo *super;
-                               vftbl_t   *supervftbl;
                                s4         superindex;
 
                                if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                                       super = NULL;
+                                       super      = NULL;
                                        superindex = 0;
-                                       supervftbl = NULL;
                                }
                                else {
-                                       super = iptr->sx.s23.s3.c.cls;
+                                       super      = iptr->sx.s23.s3.c.cls;
                                        superindex = super->index;
-                                       supervftbl = super->vftbl;
                                }
 
-#if defined(ENABLE_THREADS)
-                               codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
                                s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 
-                               /* calculate interface checkcast code size */
-
-                               s2 = 3; /* mov_membase_reg */
-                               CALCOFFSETBYTES(s2, s1, OFFSET(java_objectheader, vftbl));
-
-                               s2 += 3 + 4 /* movl_membase32_reg */ + 3 + 4 /* sub imm32 */ +
-                                       3 /* test */ + 6 /* jcc */ + 3 + 4 /* mov_membase32_reg */ +
-                                       3 /* test */ + 6 /* jcc */;
-
-                               if (super == NULL)
-                                       s2 += (opt_showdisassemble ? 5 : 0);
-
-                               /* calculate class checkcast code size */
-
-                               s3 = 3; /* mov_membase_reg */
-                               CALCOFFSETBYTES(s3, s1, OFFSET(java_objectheader, vftbl));
-                               s3 += 10 /* mov_imm_reg */ + 3 + 4 /* movl_membase32_reg */;
-
-#if 0
-                               if (s1 != REG_ITMP1) {
-                                       a += 3;    /* movl_membase_reg - only if REG_ITMP3 == R11 */
-                                       CALCOFFSETBYTES(a, REG_ITMP3, OFFSET(vftbl_t, baseval));
-                                       a += 3;    /* movl_membase_reg - only if REG_ITMP3 == R11 */
-                                       CALCOFFSETBYTES(a, REG_ITMP3, OFFSET(vftbl_t, diffval));
-                                       a += 3;    /* sub */
-                               
-                               } else
-#endif
-                                       {
-                                               s3 += 3 + 4 /* movl_membase32_reg */ + 3 /* sub */ +
-                                                       10 /* mov_imm_reg */ + 3 /* movl_membase_reg */;
-                                               CALCOFFSETBYTES(s3, REG_ITMP3, OFFSET(vftbl_t, diffval));
-                                       }
-                       
-                               s3 += 3 /* cmp */ + 6 /* jcc */;
-
-                               if (super == NULL)
-                                       s3 += (opt_showdisassemble ? 5 : 0);
-
                                /* if class is not resolved, check which code to call */
 
                                if (super == NULL) {
                                        M_TEST(s1);
-                                       M_BEQ(6 + (opt_showdisassemble ? 5 : 0) + 7 + 6 + s2 + 5 + s3);
+                                       emit_label_beq(cd, BRANCH_LABEL_1);
 
-                                       codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
-                                                                               iptr->sx.s23.s3.c.ref, 0);
-
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
+                                       patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
+                                                                                 iptr->sx.s23.s3.c.ref, 0);
 
                                        M_IMOV_IMM(0, REG_ITMP2);                 /* super->flags */
                                        M_IAND_IMM(ACC_INTERFACE, REG_ITMP2);
-                                       M_BEQ(s2 + 5);
+                                       emit_label_beq(cd, BRANCH_LABEL_2);
                                }
 
                                /* interface checkcast code */
@@ -3001,95 +1889,100 @@ gen_method:
                                if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
                                        if (super != NULL) {
                                                M_TEST(s1);
-                                               M_BEQ(s2);
+                                               emit_label_beq(cd, BRANCH_LABEL_3);
                                        }
 
-                                       M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+                                       M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
 
                                        if (super == NULL) {
-                                               codegen_addpatchref(cd,
-                                                                                       PATCHER_checkcast_instanceof_interface,
-                                                                                       iptr->sx.s23.s3.c.ref,
-                                                                                       0);
-
-                                               if (opt_showdisassemble) {
-                                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                               }
+                                               patcher_add_patch_ref(jd, PATCHER_checkcast_interface,
+                                                                                         iptr->sx.s23.s3.c.ref,
+                                                                                         0);
                                        }
 
-                                       emit_movl_membase32_reg(cd, REG_ITMP2,
-                                                                                         OFFSET(vftbl_t, interfacetablelength),
-                                                                                         REG_ITMP3);
-                                       /* XXX TWISTI: should this be int arithmetic? */
-                                       M_LSUB_IMM32(superindex, REG_ITMP3);
-                                       M_TEST(REG_ITMP3);
-                                       M_BLE(0);
-                                       codegen_add_classcastexception_ref(cd, s1);
-                                       emit_mov_membase32_reg(cd, REG_ITMP2,
-                                                                                        OFFSET(vftbl_t, interfacetable[0]) -
-                                                                                        superindex * sizeof(methodptr*),
-                                                                                        REG_ITMP3);
+                                       M_ILD32(REG_ITMP3,
+                                                       REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
+                                       M_ICMP_IMM32(superindex, REG_ITMP3);
+                                       emit_classcast_check(cd, iptr, BRANCH_LE, REG_ITMP3, s1);
+
+                                       M_ALD32(REG_ITMP3, REG_ITMP2, 
+                                                       OFFSET(vftbl_t, interfacetable[0]) -
+                                                       superindex * sizeof(methodptr*));
                                        M_TEST(REG_ITMP3);
-                                       M_BEQ(0);
-                                       codegen_add_classcastexception_ref(cd, s1);
+                                       emit_classcast_check(cd, iptr, BRANCH_EQ, REG_ITMP3, s1);
 
                                        if (super == NULL)
-                                               M_JMP_IMM(s3);
+                                               emit_label_br(cd, BRANCH_LABEL_4);
+                                       else
+                                               emit_label(cd, BRANCH_LABEL_3);
                                }
 
                                /* class checkcast code */
 
                                if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
-                                       if (super != NULL) {
+                                       if (super == NULL) {
+                                               emit_label(cd, BRANCH_LABEL_2);
+
+                                               constant_classref *cr = iptr->sx.s23.s3.c.ref;
+                                               disp = dseg_add_unique_address(cd, cr);
+
+                                               patcher_add_patch_ref(jd,
+                                                                                         PATCHER_resolve_classref_to_vftbl,
+                                                                                         cr, disp);
+                                       }
+                                       else {
                                                M_TEST(s1);
-                                               M_BEQ(s3);
+                                               emit_label_beq(cd, BRANCH_LABEL_5);
+
+                                               disp = dseg_add_address(cd, super->vftbl);
                                        }
 
-                                       M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+                                       M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
+                                       M_ALD(REG_ITMP3, RIP, disp);
 
-                                       if (super == NULL) {
-                                               codegen_addpatchref(cd, PATCHER_checkcast_class,
-                                                                                       iptr->sx.s23.s3.c.ref,
-                                                                                       0);
+                                       if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
+                                               M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+                                               M_LCMP_MEMINDEX(REG_ITMP2, 0, REG_ITMP1, 0, REG_ITMP3);
+                                               emit_label_beq(cd, BRANCH_LABEL_6);  /* good */
 
-                                               if (opt_showdisassemble) {
-                                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                               if (super == NULL) {
+                                                       M_LCMP_IMM(OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP1);
+                                                       emit_label_bne(cd, BRANCH_LABEL_10);  /* throw */
                                                }
+
+                                               M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
+                                               M_ICMP_MEMBASE(REG_ITMP2, OFFSET(vftbl_t, subtype_depth), REG_ITMP1);
+                                               emit_label_bgt(cd, BRANCH_LABEL_9);  /* throw */
+
+                                               M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow));
+                                               M_LCMP_MEMINDEX(REG_ITMP2, -8*DISPLAY_SIZE, REG_ITMP1, 3, REG_ITMP3);
+                                               emit_label_beq(cd, BRANCH_LABEL_7);  /* good */
+
+                                               emit_label(cd, BRANCH_LABEL_9);
+                                               if (super == NULL)
+                                                       emit_label(cd, BRANCH_LABEL_10);
+
+                                               /* reload s1, might have been destroyed */
+                                               emit_load_s1(jd, iptr, REG_ITMP1);
+                                               M_ALD_MEM(s1, TRAP_ClassCastException);
+
+                                               emit_label(cd, BRANCH_LABEL_7);
+                                               emit_label(cd, BRANCH_LABEL_6);
+                                               /* reload s1, might have been destroyed */
+                                               emit_load_s1(jd, iptr, REG_ITMP1);
+                                       }
+                                       else {
+                                               M_LCMP_MEMBASE(REG_ITMP2, super->vftbl->subtype_offset, REG_ITMP3);
+                                               emit_classcast_check(cd, iptr, BRANCH_NE, REG_ITMP3, s1);
                                        }
 
-                                       M_MOV_IMM(supervftbl, REG_ITMP3);
-#if defined(ENABLE_THREADS)
-                                       codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-                                       emit_movl_membase32_reg(cd, REG_ITMP2,
-                                                                                         OFFSET(vftbl_t, baseval),
-                                                                                         REG_ITMP2);
-                                       /*                                      if (s1 != REG_ITMP1) { */
-                                       /*                                              emit_movl_membase_reg(cd, REG_ITMP3, */
-                                       /*                                                                                              OFFSET(vftbl_t, baseval), */
-                                       /*                                                                                              REG_ITMP1); */
-                                       /*                                              emit_movl_membase_reg(cd, REG_ITMP3, */
-                                       /*                                                                                              OFFSET(vftbl_t, diffval), */
-                                       /*                                                                                              REG_ITMP3); */
-                                       /*  #if defined(ENABLE_THREADS) */
-                                       /*                                              codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase); */
-                                       /*  #endif */
-                                       /*                                              emit_alu_reg_reg(cd, ALU_SUB, REG_ITMP1, REG_ITMP2); */
-
-                                       /*                                      } else { */
-                                       emit_movl_membase32_reg(cd, REG_ITMP3,
-                                                                                         OFFSET(vftbl_t, baseval),
-                                                                                         REG_ITMP3);
-                                       M_LSUB(REG_ITMP3, REG_ITMP2);
-                                       M_MOV_IMM(supervftbl, REG_ITMP3);
-                                       M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
-                                       /*                                      } */
-#if defined(ENABLE_THREADS)
-                                       codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-                                       M_LCMP(REG_ITMP3, REG_ITMP2);
-                                       M_BA(0);         /* (u) REG_ITMP1 > (u) REG_ITMP2 -> jump */
-                                       codegen_add_classcastexception_ref(cd, s1);
+                                       if (super != NULL)
+                                               emit_label(cd, BRANCH_LABEL_5);
+                               }
+
+                               if (super == NULL) {
+                                       emit_label(cd, BRANCH_LABEL_1);
+                                       emit_label(cd, BRANCH_LABEL_4);
                                }
 
                                d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
@@ -3101,23 +1994,25 @@ gen_method:
                                M_INTMOVE(s1, REG_A0);
 
                                if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                                       codegen_addpatchref(cd, PATCHER_builtin_arraycheckcast,
-                                                                               iptr->sx.s23.s3.c.ref, 0);
+                                       constant_classref *cr = iptr->sx.s23.s3.c.ref;
+                                       disp = dseg_add_unique_address(cd, cr);
 
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
+                                       patcher_add_patch_ref(jd,
+                                                                                 PATCHER_resolve_classref_to_classinfo,
+                                                                                 cr, disp);
+                               }
+                               else {
+                                       disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
                                }
 
-                               M_MOV_IMM(iptr->sx.s23.s3.c.cls, REG_A1);
+                               M_ALD(REG_A1, RIP, disp);
                                M_MOV_IMM(BUILTIN_arraycheckcast, REG_ITMP1);
                                M_CALL(REG_ITMP1);
 
                                /* s1 may have been destroyed over the function call */
                                s1 = emit_load_s1(jd, iptr, REG_ITMP2);
                                M_TEST(REG_RESULT);
-                               M_BEQ(0);
-                               codegen_add_classcastexception_ref(cd, s1);
+                               emit_classcast_check(cd, iptr, BRANCH_EQ, REG_RESULT, s1);
 
                                d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
                        }
@@ -3128,179 +2023,156 @@ gen_method:
 
                case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult            */
 
-                                     /* val.a: (classinfo *) superclass              */
-
-                       /*  superclass is an interface:
-                        *      
-                        *  return (sub != NULL) &&
-                        *         (sub->vftbl->interfacetablelength > super->index) &&
-                        *         (sub->vftbl->interfacetable[-super->index] != NULL);
-                        *      
-                        *  superclass is a class:
-                        *      
-                        *  return ((sub != NULL) && (0
-                        *          <= (sub->vftbl->baseval - super->vftbl->baseval) <=
-                        *          super->vftbl->diffvall));
-                        */
-
                        {
                        classinfo *super;
-                       vftbl_t   *supervftbl;
                        s4         superindex;
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               super = NULL;
+                               super      = NULL;
                                superindex = 0;
-                               supervftbl = NULL;
-
-                       } else {
-                               super = iptr->sx.s23.s3.c.cls;
+                       }
+                       else {
+                               super      = iptr->sx.s23.s3.c.cls;
                                superindex = super->index;
-                               supervftbl = super->vftbl;
                        }
 
-#if defined(ENABLE_THREADS)
-            codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
+
                        if (s1 == d) {
                                M_INTMOVE(s1, REG_ITMP1);
                                s1 = REG_ITMP1;
                        }
 
-                       /* calculate interface instanceof code size */
-
-                       s2 = 3; /* mov_membase_reg */
-                       CALCOFFSETBYTES(s2, s1, OFFSET(java_objectheader, vftbl));
-                       s2 += 3 + 4 /* movl_membase32_reg */ + 3 + 4 /* sub_imm32 */ +
-                               3 /* test */ + 6 /* jcc */ + 3 + 4 /* mov_membase32_reg */ +
-                               3 /* test */ + 4 /* setcc */;
-
-                       if (!super)
-                               s2 += (opt_showdisassemble ? 5 : 0);
-
-                       /* calculate class instanceof code size */
-                       
-                       s3 = 3; /* mov_membase_reg */
-                       CALCOFFSETBYTES(s3, s1, OFFSET(java_objectheader, vftbl));
-                       s3 += 10; /* mov_imm_reg */
-                       s3 += 2; /* movl_membase_reg - only if REG_ITMP1 == RAX */
-                       CALCOFFSETBYTES(s3, REG_ITMP1, OFFSET(vftbl_t, baseval));
-                       s3 += 3; /* movl_membase_reg - only if REG_ITMP2 == R10 */
-                       CALCOFFSETBYTES(s3, REG_ITMP2, OFFSET(vftbl_t, baseval));
-                       s3 += 3; /* movl_membase_reg - only if REG_ITMP2 == R10 */
-                       CALCOFFSETBYTES(s3, REG_ITMP2, OFFSET(vftbl_t, diffval));
-                       s3 += 3 /* sub */ + 3 /* xor */ + 3 /* cmp */ + 4 /* setcc */;
-
-                       if (!super)
-                               s3 += (opt_showdisassemble ? 5 : 0);
-
-                       emit_alu_reg_reg(cd, ALU_XOR, d, d);
+                       M_CLR(d);
 
                        /* if class is not resolved, check which code to call */
 
-                       if (!super) {
-                               emit_test_reg_reg(cd, s1, s1);
-                               emit_jcc(cd, CC_Z, (6 + (opt_showdisassemble ? 5 : 0) +
-                                                                                        7 + 6 + s2 + 5 + s3));
-
-                               codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
-                                                                       iptr->sx.s23.s3.c.ref, 0);
+                       if (super == NULL) {
+                               M_TEST(s1);
+                               emit_label_beq(cd, BRANCH_LABEL_1);
 
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
+                               patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
+                                                                         iptr->sx.s23.s3.c.ref, 0);
 
-                               emit_movl_imm_reg(cd, 0, REG_ITMP3); /* super->flags */
-                               emit_alul_imm_reg(cd, ALU_AND, ACC_INTERFACE, REG_ITMP3);
-                               emit_jcc(cd, CC_Z, s2 + 5);
+                               M_IMOV_IMM(0, REG_ITMP3);                     /* super->flags */
+                               M_IAND_IMM(ACC_INTERFACE, REG_ITMP3);
+                               emit_label_beq(cd, BRANCH_LABEL_2);
                        }
 
                        /* interface instanceof code */
 
-                       if (!super || (super->flags & ACC_INTERFACE)) {
-                               if (super) {
-                                       emit_test_reg_reg(cd, s1, s1);
-                                       emit_jcc(cd, CC_Z, s2);
+                       if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+                               if (super != NULL) {
+                                       M_TEST(s1);
+                                       emit_label_beq(cd, BRANCH_LABEL_3);
                                }
 
-                               emit_mov_membase_reg(cd, s1,
-                                                                          OFFSET(java_objectheader, vftbl),
-                                                                          REG_ITMP1);
-                               if (!super) {
-                                       codegen_addpatchref(cd,
-                                                                               PATCHER_checkcast_instanceof_interface,
-                                                                               iptr->sx.s23.s3.c.ref, 0);
+                               M_ALD(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
 
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                                       }
+                               if (super == NULL) {
+                                       patcher_add_patch_ref(jd, PATCHER_instanceof_interface,
+                                                                                 iptr->sx.s23.s3.c.ref, 0);
                                }
 
-                               emit_movl_membase32_reg(cd, REG_ITMP1,
-                                                                                 OFFSET(vftbl_t, interfacetablelength),
-                                                                                 REG_ITMP3);
-                               emit_alu_imm32_reg(cd, ALU_SUB, superindex, REG_ITMP3);
-                               emit_test_reg_reg(cd, REG_ITMP3, REG_ITMP3);
+                               M_ILD32(REG_ITMP3,
+                                               REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
+                               M_ICMP_IMM32(superindex, REG_ITMP3);
 
-                               a = 3 + 4 /* mov_membase32_reg */ + 3 /* test */ + 4 /* setcc */;
+                               int a = 3 + 4 /* mov_membase32_reg */ + 3 /* test */ + 4 /* setcc */;
 
-                               emit_jcc(cd, CC_LE, a);
-                               emit_mov_membase32_reg(cd, REG_ITMP1,
-                                                                                OFFSET(vftbl_t, interfacetable[0]) -
-                                                                                superindex * sizeof(methodptr*),
-                                                                                REG_ITMP1);
-                               emit_test_reg_reg(cd, REG_ITMP1, REG_ITMP1);
-                               emit_setcc_reg(cd, CC_NE, d);
+                               M_BLE(a);
+                               M_ALD32(REG_ITMP1, REG_ITMP1,
+                                               OFFSET(vftbl_t, interfacetable[0]) -
+                                               superindex * sizeof(methodptr*));
+                               M_TEST(REG_ITMP1);
+                               M_SETNE(d);
 
-                               if (!super)
-                                       emit_jmp_imm(cd, s3);
+                               if (super == NULL)
+                                       emit_label_br(cd, BRANCH_LABEL_4);
+                               else
+                                       emit_label(cd, BRANCH_LABEL_3);
                        }
 
                        /* class instanceof code */
 
-                       if (!super || !(super->flags & ACC_INTERFACE)) {
-                               if (super) {
-                                       emit_test_reg_reg(cd, s1, s1);
-                                       emit_jcc(cd, CC_E, s3);
+                       if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
+                               if (super == NULL) {
+                                       emit_label(cd, BRANCH_LABEL_2);
+
+                                       constant_classref *cr = iptr->sx.s23.s3.c.ref;
+                                       disp = dseg_add_unique_address(cd, cr);
+
+                                       patcher_add_patch_ref(jd,
+                                                                                 PATCHER_resolve_classref_to_vftbl,
+                                                                                 cr, disp);
+                               }
+                               else {
+                                       M_TEST(s1);
+                                       emit_label_beq(cd, BRANCH_LABEL_5);
+
+                                       disp = dseg_add_address(cd, super->vftbl);
                                }
 
-                               emit_mov_membase_reg(cd, s1,
-                                                                          OFFSET(java_objectheader, vftbl),
-                                                                          REG_ITMP1);
+                               M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
+                               M_ALD(REG_ITMP3, RIP, disp);
+
+                               if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
+                                       M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+                                       M_LCMP_MEMINDEX(REG_ITMP2, 0, REG_ITMP1, 0, REG_ITMP3);
+                                       emit_label_bne(cd, BRANCH_LABEL_8); /* jump over INC/SETE */
+                                       if (d == REG_ITMP2) {
+                                               M_SETE(d);
+                                               M_BSEXT(d, d);
+                                       } else
+                                               M_LINC(d);
+                                       emit_label_br(cd, BRANCH_LABEL_6);  /* true */
+                                       emit_label(cd, BRANCH_LABEL_8);
+
+                                       if (super == NULL) {
+                                               M_LCMP_IMM(OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP1);
+                                               emit_label_bne(cd, BRANCH_LABEL_10);  /* false */
+                                       }
+
+                                       M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
+                                       M_ICMP_MEMBASE(REG_ITMP2, OFFSET(vftbl_t, subtype_depth), REG_ITMP1);
+                                       emit_label_bgt(cd, BRANCH_LABEL_9);  /* false */
+
+                                       M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow));
+                                       M_LCMP_MEMINDEX(REG_ITMP2, -8*DISPLAY_SIZE, REG_ITMP1, 3, REG_ITMP3);
+                                       M_SETE(d);
+                                       if (d == REG_ITMP2) {
+                                               M_BSEXT(d, d);
 
-                               if (!super) {
-                                       codegen_addpatchref(cd, PATCHER_instanceof_class,
-                                                                               iptr->sx.s23.s3.c.ref, 0);
+                                               emit_label_br(cd, BRANCH_LABEL_7); /* jump over M_CLR */
+                                       }
+
+                                       emit_label(cd, BRANCH_LABEL_9);
+                                       if (super == NULL)
+                                               emit_label(cd, BRANCH_LABEL_10);
+                                       if (d == REG_ITMP2) {
+                                               M_CLR(d);
 
-                                       if (opt_showdisassemble) {
-                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                               emit_label(cd, BRANCH_LABEL_7);
                                        }
+                                       emit_label(cd, BRANCH_LABEL_6);
+                               }
+                               else {
+                                       M_LCMP_MEMBASE(REG_ITMP2, super->vftbl->subtype_offset, REG_ITMP3);
+                                       M_SETE(d);
+                                       if (d == REG_ITMP2)
+                                               M_BSEXT(d, d);
                                }
 
-                               emit_mov_imm_reg(cd, (ptrint) supervftbl, REG_ITMP2);
-#if defined(ENABLE_THREADS)
-                               codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-                               emit_movl_membase_reg(cd, REG_ITMP1,
-                                                                               OFFSET(vftbl_t, baseval),
-                                                                               REG_ITMP1);
-                               emit_movl_membase_reg(cd, REG_ITMP2,
-                                                                               OFFSET(vftbl_t, diffval),
-                                                                               REG_ITMP3);
-                               emit_movl_membase_reg(cd, REG_ITMP2,
-                                                                               OFFSET(vftbl_t, baseval),
-                                                                               REG_ITMP2);
-#if defined(ENABLE_THREADS)
-                               codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-                               emit_alu_reg_reg(cd, ALU_SUB, REG_ITMP2, REG_ITMP1);
-                               emit_alu_reg_reg(cd, ALU_XOR, d, d); /* may be REG_ITMP2 */
-                               emit_alu_reg_reg(cd, ALU_CMP, REG_ITMP3, REG_ITMP1);
-                               emit_setcc_reg(cd, CC_BE, d);
+                               if (super != NULL)
+                                       emit_label(cd, BRANCH_LABEL_5);
+                       }
+
+                       if (super == NULL) {
+                               emit_label(cd, BRANCH_LABEL_1);
+                               emit_label(cd, BRANCH_LABEL_4);
                        }
+
                        emit_store_dst(jd, iptr, d);
                        }
                        break;
@@ -3323,24 +2195,26 @@ gen_method:
                                }
                        }
 
+                       /* a0 = dimension count */
+
+                       M_MOV_IMM(iptr->s1.argcount, REG_A0);
+
                        /* is a patcher function set? */
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               codegen_addpatchref(cd, PATCHER_builtin_multianewarray,
-                                                                       iptr->sx.s23.s3.c.ref, 0);
+                               constant_classref *cr = iptr->sx.s23.s3.c.ref;
+                               disp = dseg_add_unique_address(cd, cr);
 
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-                               }
+                               patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
+                                                                         cr, disp);
+                       }
+                       else {
+                               disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
                        }
-
-                       /* a0 = dimension count */
-
-                       M_MOV_IMM(iptr->s1.argcount, REG_A0);
 
                        /* a1 = classinfo */
 
-                       M_MOV_IMM(iptr->sx.s23.s3.c.cls, REG_A1);
+                       M_ALD(REG_A1, RIP, disp);
 
                        /* a2 = pointer to dimensions = stack pointer */
 
@@ -3351,9 +2225,7 @@ gen_method:
 
                        /* check for exception before result assignment */
 
-                       M_TEST(REG_RESULT);
-                       M_BEQ(0);
-                       codegen_add_fillinstacktrace_ref(cd);
+                       emit_exception_check(cd, iptr);
 
                        s1 = codegen_reg_of_dst(jd, iptr, REG_RESULT);
                        M_INTMOVE(REG_RESULT, s1);
@@ -3361,160 +2233,61 @@ gen_method:
                        break;
 
                default:
-                       *exceptionptr = new_internalerror("Unknown ICMD %d", iptr->opc);
-                       return false;
+                       vm_abort("Unknown ICMD %d during code generation", iptr->opc);
        } /* switch */
-
-       } /* for instruction */
-               
-       MCODECHECK(512); /* XXX require a lower number? */
-
-       /* At the end of a basic block we may have to append some nops,
-          because the patcher stub calling code might be longer than the
-          actual instruction. So codepatching does not change the
-          following block unintentionally. */
-
-       if (cd->mcodeptr < cd->lastmcodeptr) {
-               while (cd->mcodeptr < cd->lastmcodeptr) {
-                       M_NOP;
-               }
-       }
-
-       } /* if (bptr -> flags >= BBREACHED) */
-       } /* for basic block */
-
-       dseg_createlinenumbertable(cd);
-
-       /* generate stubs */
-
-       emit_exception_stubs(jd);
-       emit_patcher_stubs(jd);
-#if 0
-       emit_replacement_stubs(jd);
-#endif
-
-       codegen_finish(jd);
-
-       /* everything's ok */
-
-       return true;
 }
 
 
-/* createcompilerstub **********************************************************
-
-   Creates a stub routine which calls the compiler.
-       
-*******************************************************************************/
-
-#define COMPILERSTUB_DATASIZE    3 * SIZEOF_VOID_P
-#define COMPILERSTUB_CODESIZE    7 + 7 + 3
+/* codegen_emit_stub_native ****************************************************
 
-#define COMPILERSTUB_SIZE        COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
+   Emits a stub routine which calls a native method.
 
+*******************************************************************************/
 
-u1 *createcompilerstub(methodinfo *m)
+void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int skipparams)
 {
-       u1          *s;                     /* memory to hold the stub            */
-       ptrint      *d;
+       methodinfo  *m;
        codeinfo    *code;
        codegendata *cd;
-       s4           dumpsize;
-
-       s = CNEW(u1, COMPILERSTUB_SIZE);
-
-       /* set data pointer and code pointer */
-
-       d = (ptrint *) s;
-       s = s + COMPILERSTUB_DATASIZE;
-
-       /* mark start of dump memory area */
-
-       dumpsize = dump_size();
+       methoddesc  *md;
+       int          i, j;
+       int          s1, s2;
+       int          disp;
 
-       cd = DNEW(codegendata);
-       cd->mcodeptr = s;
+       /* Sanity check. */
 
-       /* Store the codeinfo pointer in the same place as in the
-          methodheader for compiled methods. */
-
-       code = code_codeinfo_new(m);
-
-       d[0] = (ptrint) asm_call_jit_compiler;
-       d[1] = (ptrint) m;
-       d[2] = (ptrint) code;
-
-       /* code for the stub */
-
-       M_ALD(REG_ITMP1, RIP, -(7 * 1 + 2 * SIZEOF_VOID_P));       /* methodinfo  */
-       M_ALD(REG_ITMP3, RIP, -(7 * 2 + 3 * SIZEOF_VOID_P));  /* compiler pointer */
-       M_JMP(REG_ITMP3);
-
-#if defined(ENABLE_STATISTICS)
-       if (opt_stat)
-               count_cstub_len += COMPILERSTUB_SIZE;
-#endif
-
-       /* release dump area */
-
-       dump_release(dumpsize);
-
-       return s;
-}
-
-
-/* createnativestub ************************************************************
-
-   Creates a stub routine which calls a native method.
-
-*******************************************************************************/
+       assert(f != NULL);
 
-u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
-{
-       methodinfo   *m;
-       codeinfo     *code;
-       codegendata  *cd;
-       registerdata *rd;
-       methoddesc   *md;
-       s4            nativeparams;
-       s4            i, j;                 /* count variables                    */
-       s4            t;
-       s4            s1, s2;
-
-       /* get required compiler data */
+       /* Get required compiler data. */
 
        m    = jd->m;
        code = jd->code;
        cd   = jd->cd;
-       rd   = jd->rd;
 
        /* initialize variables */
 
        md = m->parseddesc;
-       nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
 
        /* calculate stack frame size */
 
        cd->stackframesize =
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
-               INT_ARG_CNT + FLT_ARG_CNT +
-               1 +                       /* functionptr, TODO: store in data segment */
+               md->paramcount +
+               (md->returntype.type == TYPE_VOID ? 0 : 1) +
                nmd->memuse;
 
-       cd->stackframesize |= 0x1;                  /* keep stack 16-byte aligned */
+       ALIGN_ODD(cd->stackframesize);              /* keep stack 16-byte aligned */
 
        /* create method header */
 
-       (void) dseg_addaddress(cd, code);                      /* CodeinfoPointer */
-       (void) dseg_adds4(cd, cd->stackframesize * 8);         /* FrameSize       */
-       (void) dseg_adds4(cd, 0);                              /* IsSync          */
-       (void) dseg_adds4(cd, 0);                              /* IsLeaf          */
-       (void) dseg_adds4(cd, 0);                              /* IntSave         */
-       (void) dseg_adds4(cd, 0);                              /* FltSave         */
-       (void) dseg_addlinenumbertablesize(cd);
-       (void) dseg_adds4(cd, 0);                              /* ExTableSize     */
+       (void) dseg_add_unique_address(cd, code);              /* CodeinfoPointer */
+       (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize       */
+       (void) dseg_add_unique_s4(cd, 0);                      /* IsLeaf          */
+       (void) dseg_add_unique_s4(cd, 0);                      /* IntSave         */
+       (void) dseg_add_unique_s4(cd, 0);                      /* FltSave         */
 
+#if defined(ENABLE_PROFILING)
        /* generate native method profiling code */
 
        if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
@@ -3523,162 +2296,203 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
                M_MOV_IMM(code, REG_ITMP3);
                M_IINC_MEMBASE(REG_ITMP3, OFFSET(codeinfo, frequency));
        }
+#endif
 
        /* generate stub code */
 
        M_ASUB_IMM(cd->stackframesize * 8, REG_SP);
 
-#if !defined(NDEBUG)
-       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-               emit_verbosecall_enter(jd);
-#endif
-
-       /* get function address (this must happen before the stackframeinfo) */
+#if defined(ENABLE_GC_CACAO)
+       /* Save callee saved integer registers in stackframeinfo (GC may
+          need to recover them during a collection). */
 
-#if !defined(WITH_STATIC_CLASSPATH)
-       if (f == NULL) {
-               codegen_addpatchref(cd, PATCHER_resolve_native, m, 0);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
-               if (opt_showdisassemble) {
-                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
-               }
-       }
+       for (i = 0; i < INT_SAV_CNT; i++)
+               M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 8);
 #endif
 
-       M_MOV_IMM(f, REG_ITMP3);
-
-
        /* save integer and float argument registers */
 
-       for (i = 0, j = 0; i < md->paramcount; i++) {
+       for (i = 0; i < md->paramcount; i++) {
                if (!md->params[i].inmemory) {
                        s1 = md->params[i].regoff;
 
-                       if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
-                               M_LST(rd->argintregs[s1], REG_SP, j * 8);
-                       else
-                               M_DST(rd->argfltregs[s1], REG_SP, j * 8);
-
-                       j++;
+                       switch (md->paramtypes[i].type) {
+                       case TYPE_INT:
+                       case TYPE_LNG:
+                       case TYPE_ADR:
+                               M_LST(s1, REG_SP, i * 8);
+                               break;
+                       case TYPE_FLT:
+                       case TYPE_DBL:
+                               M_DST(s1, REG_SP, i * 8);
+                               break;
+                       }
                }
        }
 
-       M_AST(REG_ITMP3, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT) * 8);
-
        /* create dynamic stack info */
 
-       M_ALEA(REG_SP, cd->stackframesize * 8, REG_A0);
+       M_MOV(REG_SP, REG_A0);
        emit_lea_membase_reg(cd, RIP, -((cd->mcodeptr + 7) - cd->mcodebase), REG_A1);
-       M_ALEA(REG_SP, cd->stackframesize * 8 + SIZEOF_VOID_P, REG_A2);
-       M_ALD(REG_A3, REG_SP, cd->stackframesize * 8);
        M_MOV_IMM(codegen_start_native_call, REG_ITMP1);
        M_CALL(REG_ITMP1);
 
+       /* remember class argument */
+
+       if (m->flags & ACC_STATIC)
+               M_MOV(REG_RESULT, REG_ITMP2);
+
        /* restore integer and float argument registers */
 
-       for (i = 0, j = 0; i < md->paramcount; i++) {
+       for (i = 0; i < md->paramcount; i++) {
                if (!md->params[i].inmemory) {
                        s1 = md->params[i].regoff;
 
-                       if (IS_INT_LNG_TYPE(md->paramtypes[i].type))
-                               M_LLD(rd->argintregs[s1], REG_SP, j * 8);
-                       else
-                               M_DLD(rd->argfltregs[s1], REG_SP, j * 8);
-
-                       j++;
+                       switch (md->paramtypes[i].type) {
+                       case TYPE_INT:
+                       case TYPE_LNG:
+                       case TYPE_ADR:
+                               M_LLD(s1, REG_SP, i * 8);
+                               break;
+                       case TYPE_FLT:
+                       case TYPE_DBL:
+                               M_DLD(s1, REG_SP, i * 8);
+                               break;
+                       }
                }
        }
 
-       M_ALD(REG_ITMP3, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT) * 8);
-
-
-       /* copy or spill arguments to new locations */
+       /* Copy or spill arguments to new locations. */
 
-       for (i = md->paramcount - 1, j = i + nativeparams; i >= 0; i--, j--) {
-               t = md->paramtypes[i].type;
+       for (i = md->paramcount - 1, j = i + skipparams; i >= 0; i--, j--) {
+               s2 = nmd->params[j].regoff;
 
-               if (IS_INT_LNG_TYPE(t)) {
+               switch (md->paramtypes[i].type) {
+               case TYPE_INT:
+               case TYPE_LNG:
+               case TYPE_ADR:
                        if (!md->params[i].inmemory) {
-                               s1 = rd->argintregs[md->params[i].regoff];
+                               s1 = md->params[i].regoff;
 
-                               if (!nmd->params[j].inmemory) {
-                                       s2 = rd->argintregs[nmd->params[j].regoff];
+                               if (!nmd->params[j].inmemory)
                                        M_INTMOVE(s1, s2);
-
-                               } else {
-                                       s2 = nmd->params[j].regoff;
-                                       M_LST(s1, REG_SP, s2 * 8);
-                               }
-
-                       } else {
-                               s1 = md->params[i].regoff + cd->stackframesize + 1;   /* + 1 (RA) */
-                               s2 = nmd->params[j].regoff;
-                               M_LLD(REG_ITMP1, REG_SP, s1 * 8);
-                               M_LST(REG_ITMP1, REG_SP, s2 * 8);
+                               else
+                                       M_LST(s1, REG_SP, s2);
+                       }
+                       else {
+                               s1 = md->params[i].regoff + cd->stackframesize * 8 + 8;/* +1 (RA) */
+                               M_LLD(REG_ITMP1, REG_SP, s1);
+                               M_LST(REG_ITMP1, REG_SP, s2);
                        }
+                       break;
+               case TYPE_FLT:
+                       /* We only copy spilled float arguments, as the float
+                          argument registers keep unchanged. */
 
-               } else {
-                       /* We only copy spilled float arguments, as the float argument    */
-                       /* registers keep unchanged.                                      */
+                       if (md->params[i].inmemory) {
+                               s1 = md->params[i].regoff + cd->stackframesize * 8 + 8;/* +1 (RA) */
 
+                               M_FLD(REG_FTMP1, REG_SP, s1);
+                               M_FST(REG_FTMP1, REG_SP, s2);
+                       }
+                       break;
+               case TYPE_DBL:
                        if (md->params[i].inmemory) {
-                               s1 = md->params[i].regoff + cd->stackframesize + 1;   /* + 1 (RA) */
-                               s2 = nmd->params[j].regoff;
-
-                               if (IS_2_WORD_TYPE(t)) {
-                                       M_DLD(REG_FTMP1, REG_SP, s1 * 8);
-                                       M_DST(REG_FTMP1, REG_SP, s2 * 8);
-                               } else {
-                                       M_FLD(REG_FTMP1, REG_SP, s1 * 8);
-                                       M_FST(REG_FTMP1, REG_SP, s2 * 8);
-                               }
+                               s1 = md->params[i].regoff + cd->stackframesize * 8 + 8;/* +1 (RA) */
+                               M_DLD(REG_FTMP1, REG_SP, s1);
+                               M_DST(REG_FTMP1, REG_SP, s2);
                        }
+                       break;
                }
        }
 
-       /* put class into second argument register */
+       /* Handle native Java methods. */
 
-       if (m->flags & ACC_STATIC)
-               M_MOV_IMM(m->class, REG_A1);
+       if (m->flags & ACC_NATIVE) {
+               /* put class into second argument register */
 
-       /* put env into first argument register */
+               if (m->flags & ACC_STATIC)
+                       M_MOV(REG_ITMP2, REG_A1);
 
-       M_MOV_IMM(_Jv_env, REG_A0);
+               /* put env into first argument register */
+
+               M_MOV_IMM(VM_get_jnienv(), REG_A0);
+       }
 
-       /* do the native function call */
+       /* Call the native function. */
 
-       M_CALL(REG_ITMP3);
+       disp = dseg_add_functionptr(cd, f);
+       M_ALD(REG_ITMP1, RIP, disp);
+       M_CALL(REG_ITMP1);
 
        /* save return value */
 
-       if (md->returntype.type != TYPE_VOID) {
-               if (IS_INT_LNG_TYPE(md->returntype.type))
-                       M_LST(REG_RESULT, REG_SP, 0 * 8);
-               else
-                       M_DST(REG_FRESULT, REG_SP, 0 * 8);
+       switch (md->returntype.type) {
+       case TYPE_INT:
+       case TYPE_LNG:
+       case TYPE_ADR:
+               switch (md->returntype.primitivetype) {
+               case PRIMITIVETYPE_BOOLEAN:
+                       M_BZEXT(REG_RESULT, REG_RESULT);
+                       break;
+               case PRIMITIVETYPE_BYTE:
+                       M_BSEXT(REG_RESULT, REG_RESULT);
+                       break;
+               case PRIMITIVETYPE_CHAR:
+                       M_CZEXT(REG_RESULT, REG_RESULT);
+                       break;
+               case PRIMITIVETYPE_SHORT:
+                       M_SSEXT(REG_RESULT, REG_RESULT);
+                       break;
+               }
+               M_LST(REG_RESULT, REG_SP, 0 * 8);
+               break;
+       case TYPE_FLT:
+       case TYPE_DBL:
+               M_DST(REG_FRESULT, REG_SP, 0 * 8);
+               break;
+       case TYPE_VOID:
+               break;
        }
 
-#if !defined(NDEBUG)
-       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-               emit_verbosecall_exit(jd);
-#endif
-
        /* remove native stackframe info */
 
-       M_ALEA(REG_SP, cd->stackframesize * 8, REG_A0);
+       M_MOV(REG_SP, REG_A0);
+       emit_lea_membase_reg(cd, RIP, -((cd->mcodeptr + 7) - cd->mcodebase), REG_A1);
        M_MOV_IMM(codegen_finish_native_call, REG_ITMP1);
        M_CALL(REG_ITMP1);
        M_MOV(REG_RESULT, REG_ITMP3);
 
        /* restore return value */
 
-       if (md->returntype.type != TYPE_VOID) {
-               if (IS_INT_LNG_TYPE(md->returntype.type))
-                       M_LLD(REG_RESULT, REG_SP, 0 * 8);
-               else
-                       M_DLD(REG_FRESULT, REG_SP, 0 * 8);
+       switch (md->returntype.type) {
+       case TYPE_INT:
+       case TYPE_LNG:
+       case TYPE_ADR:
+               M_LLD(REG_RESULT, REG_SP, 0 * 8);
+               break;
+       case TYPE_FLT:
+       case TYPE_DBL:
+               M_DLD(REG_FRESULT, REG_SP, 0 * 8);
+               break;
+       case TYPE_VOID:
+               break;
        }
 
+#if defined(ENABLE_GC_CACAO)
+       /* Restore callee saved integer registers from stackframeinfo (GC
+          might have modified them during a collection). */
+        
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
+
+       for (i = 0; i < INT_SAV_CNT; i++)
+               M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 8);
+#endif
+
        /* remove stackframe */
 
        M_AADD_IMM(cd->stackframesize * 8, REG_SP);
@@ -3697,14 +2511,6 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 
        M_MOV_IMM(asm_handle_nat_exception, REG_ITMP3);
        M_JMP(REG_ITMP3);
-
-       /* generate patcher stubs */
-
-       emit_patcher_stubs(jd);
-
-       codegen_finish(jd);
-
-       return code->entrypoint;
 }