X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Falpha%2Fcodegen.c;h=9936648fcca545d84b2a121a15dceb91ffa77f0d;hb=bbc14f3688db91816c8112c1a899c9a44c7305af;hp=66dbd576aebd6ebaa4f81f80f6530717d1bd22ee;hpb=abe50084a6e83f833d1d2a0274bc75a8a89b25f4;p=cacao.git

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index 66dbd576a..b136fd4dc 100644
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/alpha/codegen.c - machine code generator for Alpha
 
-   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
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,18 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Andreas Krall
-            Reinhard Grafl
-
-   Changes: Joseph Wenninger
-            Christian Thalinger
-            Christian Ullrich
-            Edwin Steiner
-
-   $Id: codegen.c 5630 2006-10-02 13:16:20Z edwin $
-
 */
 
 
@@ -50,42 +36,49 @@
 #include "vm/jit/alpha/arch.h"
 #include "vm/jit/alpha/codegen.h"
 
-#include "native/jni.h"
-#include "native/native.h"
+#include "mm/memory.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "native/localref.hpp"
+#include "native/native.hpp"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "threads/lock.hpp"
+
+#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/stringlocal.h"
-#include "vm/vm.h"
+#include "vm/vm.hpp"
+
+#include "vm/jit/abi.h"
 #include "vm/jit/asmpart.h"
-#include "vm/jit/codegen-common.h"
+#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/parse.h"
-#include "vm/jit/patcher.h"
+#include "vm/jit/emit-common.hpp"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/linenumbertable.hpp"
+#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/replace.hpp"
+#include "vm/jit/stacktrace.hpp"
+#include "vm/jit/trap.h"
+
+#if defined(ENABLE_SSA)
+# include "vm/jit/optimizing/lsra.h"
+# include "vm/jit/optimizing/ssa.h"
+#elif defined(ENABLE_LSRA)
 # include "vm/jit/allocator/lsra.h"
 #endif
 
 
-/* codegen *********************************************************************
+/* codegen_emit ****************************************************************
 
    Generates machine code.
 
 *******************************************************************************/
 
-bool codegen(jitdata *jd)
+bool codegen_emit(jitdata *jd)
 {
 	methodinfo         *m;
 	codeinfo           *code;
@@ -95,13 +88,13 @@ bool codegen(jitdata *jd)
 	varinfo            *var;
 	basicblock         *bptr;
 	instruction        *iptr;
-	exceptiontable     *ex;
 	u2                  currentline;
 	methodinfo         *lm;             /* local methodinfo for ICMD_INVOKE*  */
 	unresolved_method  *um;
 	builtintable_entry *bte;
 	methoddesc         *md;
-	rplpoint           *replacementpoint;
+	fieldinfo          *fi;
+	unresolved_field   *uf;
 	s4                  fieldtype;
 	s4                 varindex;
 
@@ -114,16 +107,18 @@ bool codegen(jitdata *jd)
 
 	/* prevent compiler warnings */
 
-	d = 0;
+	d           = 0;
+	fieldtype   = 0;
+	lm          = NULL;
+	um          = NULL;
+	bte         = NULL;
 	currentline = 0;
-	lm = NULL;
-	bte = NULL;
 
 	{
 	s4 i, p, t, l;
 	s4 savedregs_num;
 
-	savedregs_num = (jd->isleafmethod) ? 0 : 1;       /* space to save the RA */
+	savedregs_num = code_is_leafmethod(code) ? 0 : 1; /* space to save the RA */
 
 	/* space to save used callee saved registers */
 
@@ -133,7 +128,7 @@ bool codegen(jitdata *jd)
 	cd->stackframesize = rd->memuse + savedregs_num;
 
 #if defined(ENABLE_THREADS)        /* space to save argument of monitor_enter */
-	if (checksync && (m->flags & ACC_SYNCHRONIZED))
+	if (checksync && code_is_synchronized(code))
 		cd->stackframesize++;
 #endif
 
@@ -146,36 +141,18 @@ bool codegen(jitdata *jd)
 	(void) dseg_add_unique_address(cd, code);              /* CodeinfoPointer */
 	(void) dseg_add_unique_s4(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_add_unique_s4(cd, (rd->memuse + 1) * 8);       /* IsSync  */
+	code->synchronizedoffset = rd->memuse * 8;
+
+	/* REMOVEME: We still need it for exception handling in assembler. */
+
+	if (code_is_leafmethod(code))
+		(void) dseg_add_unique_s4(cd, 1);
 	else
-#endif
-		(void) dseg_add_unique_s4(cd, 0);                          /* IsSync  */
+		(void) dseg_add_unique_s4(cd, 0);
 
-	(void) dseg_add_unique_s4(cd, jd->isleafmethod);               /* IsLeaf  */
 	(void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
 	(void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
 
-	dseg_addlinenumbertablesize(cd);
-
-	(void) dseg_add_unique_s4(cd, cd->exceptiontablelength);   /* ExTableSize */
-
-	/* create exception table */
-
-	for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
-		dseg_add_target(cd, ex->start);
-   		dseg_add_target(cd, ex->end);
-		dseg_add_target(cd, ex->handler);
-		(void) dseg_add_unique_address(cd, ex->catchtype.any);
-	}
-	
 	/* create stack frame (if necessary) */
 
 	if (cd->stackframesize)
@@ -184,7 +161,7 @@ bool codegen(jitdata *jd)
 	/* save return address and used callee saved registers */
 
 	p = cd->stackframesize;
-	if (!jd->isleafmethod) {
+	if (!code_is_leafmethod(code)) {
 		p--; M_AST(REG_RA, REG_SP, p * 8);
 	}
 	for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
@@ -216,48 +193,38 @@ bool codegen(jitdata *jd)
 
 		if (IS_INT_LNG_TYPE(t)) {                    /* integer args          */
  			if (!md->params[p].inmemory) {           /* register arguments    */
-				s2 = rd->argintregs[s1];
- 				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 */
- 					M_LLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) *8);
-
- 				} else {                             /* stack arg -> spilled  */
-					var->vv.regoff = cd->stackframesize + s1;
-				}
+ 				if (!IS_INMEMORY(var->flags))
+ 					M_INTMOVE(s1, var->vv.regoff);
+				else
+ 					M_LST(s1, REG_SP, var->vv.regoff);
 			}
-
-		} else {                                     /* floating args         */
+			else {                                   /* stack arguments       */
+ 				if (!IS_INMEMORY(var->flags))
+ 					M_LLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
+				else
+					var->vv.regoff = cd->stackframesize * 8 + s1;
+			}
+		}
+		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 (!(var->flags & INMEMORY)) {      /* stack-arg -> register */
- 					M_DLD(var->vv.regoff, REG_SP, (cd->stackframesize + s1) * 8);
-
- 				} else {                             /* stack-arg -> spilled  */
-					var->vv.regoff = cd->stackframesize + s1;
-				}
+ 				if (!IS_INMEMORY(var->flags))
+ 					M_FLTMOVE(s1, var->vv.regoff);
+ 				else
+ 					M_DST(s1, REG_SP, var->vv.regoff * 8);
+			}
+			else {                                   /* stack arguments       */
+ 				if (!(var->flags & INMEMORY))
+ 					M_DLD(var->vv.regoff, REG_SP, cd->stackframesize * 8 + s1);
+				else
+					var->vv.regoff = cd->stackframesize * 8 + s1;
 			}
 		}
-	} /* end for */
+	}
 
 	/* call monitorenter function */
 
 #if defined(ENABLE_THREADS)
-	if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+	if (checksync && code_is_synchronized(code)) {
 		/* stack offset for monitor argument */
 
 		s1 = rd->memuse;
@@ -267,10 +234,10 @@ bool codegen(jitdata *jd)
 			M_LDA(REG_SP, REG_SP, -(INT_ARG_CNT + FLT_ARG_CNT) * 8);
 
 			for (p = 0; p < INT_ARG_CNT; p++)
-				M_LST(rd->argintregs[p], REG_SP, p * 8);
+				M_LST(abi_registers_integer_argument[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);
+				M_DST(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
 
 			s1 += INT_ARG_CNT + FLT_ARG_CNT;
 		}
@@ -279,12 +246,12 @@ bool codegen(jitdata *jd)
 		/* decide which monitor enter function to call */
 
 		if (m->flags & ACC_STATIC) {
-			disp = dseg_add_address(cd, &m->class->object.header);
+			disp = dseg_add_address(cd, &m->clazz->object.header);
 			M_ALD(REG_A0, REG_PV, disp);
 		}
 		else {
-			M_BEQZ(REG_A0, 0);
-			codegen_add_nullpointerexception_ref(cd);
+			M_BNEZ(REG_A0, 1);
+			M_ALD_INTERN(REG_ZERO, REG_ZERO, TRAP_NullPointerException);
 		}
 
 		M_AST(REG_A0, REG_SP, s1 * 8);
@@ -297,10 +264,10 @@ bool codegen(jitdata *jd)
 #if !defined(NDEBUG)
 		if (opt_verbosecall) {
 			for (p = 0; p < INT_ARG_CNT; p++)
-				M_LLD(rd->argintregs[p], REG_SP, p * 8);
+				M_LLD(abi_registers_integer_argument[p], REG_SP, p * 8);
 
 			for (p = 0; p < FLT_ARG_CNT; p++)
-				M_DLD(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
+				M_DLD(abi_registers_float_argument[p], REG_SP, (INT_ARG_CNT + p) * 8);
 
 			M_LDA(REG_SP, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT) * 8);
 		}
@@ -319,11 +286,13 @@ bool codegen(jitdata *jd)
 
 	/* end of header generation */
 
-	replacementpoint = jd->code->rplpoints;
+	/* create replacement points */
+
+	REPLACEMENT_POINTS_INIT(cd, jd);
 
 	/* walk through all basic blocks */
 
-	for (bptr = jd->new_basicblocks; bptr != NULL; bptr = bptr->next) {
+	for (bptr = jd->basicblocks; bptr != NULL; bptr = bptr->next) {
 
 		bptr->mpc = (s4) (cd->mcodeptr - cd->mcodebase);
 
@@ -331,23 +300,11 @@ bool codegen(jitdata *jd)
 
 		/* branch resolving */
 
-		{
-		branchref *brefs;
-		for (brefs = bptr->branchrefs; brefs != NULL; brefs = brefs->next) {
-			gen_resolvebranch((u1*) cd->mcodebase + brefs->branchpos, 
-			                  brefs->branchpos, bptr->mpc);
-			}
-		}
+		codegen_resolve_branchrefs(cd, bptr);
 
 		/* handle replacement points */
 
-#if 0
-		if (bptr->bitflags & BBFLAG_REPLACEMENT) {
-			replacementpoint->pc = (u1*)(ptrint)bptr->mpc; /* will be resolved later */
-			
-			replacementpoint++;
-		}
-#endif
+		REPLACEMENT_POINT_BLOCK_START(cd, bptr);
 
 		/* copy interface registers to their destination */
 
@@ -358,7 +315,7 @@ bool codegen(jitdata *jd)
 		while (len) {
 			len--;
 			src = bptr->invars[len];
-			if ((len == bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
+			if ((len == bptr->indepth-1) && (bptr->type == BBTYPE_EXH)) {
 					/* 				d = reg_of_var(m, src, REG_ITMP1); */
 					if (!(src->flags & INMEMORY))
 						d = src->vv.regoff;
@@ -373,14 +330,13 @@ bool codegen(jitdata *jd)
 			while (len) {
 				len--;
 				var = VAR(bptr->invars[len]);
- 				if ((len == bptr->indepth-1) && (bptr->type != BBTYPE_STD)) {
+ 				if ((len == bptr->indepth-1) && (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 & OUTVAR));
+					assert((var->flags & INOUT));
 				}
 			}
 #if defined(ENABLE_LSRA)
@@ -393,25 +349,40 @@ bool codegen(jitdata *jd)
 
 		for (iptr = bptr->iinstr; len > 0; len--, iptr++) {
 			if (iptr->line != currentline) {
-				dseg_addlinenumber(cd, iptr->line);
+				linenumbertable_list_entry_add(cd, iptr->line);
 				currentline = iptr->line;
 			}
 
 		MCODECHECK(64);       /* an instruction usually needs < 64 words      */
 		switch (iptr->opc) {
 
+		case ICMD_NOP:        /* ...  ==> ...                                 */
+		case ICMD_POP:        /* ..., value  ==> ...                          */
+		case ICMD_POP2:       /* ..., value, value  ==> ...                   */
+			break;
+
 		case ICMD_INLINE_START:
-		case ICMD_INLINE_END:
+
+			REPLACEMENT_POINT_INLINE_START(cd, iptr);
 			break;
 
-		case ICMD_NOP:        /* ...  ==> ...                                 */
+		case ICMD_INLINE_BODY:
+
+			REPLACEMENT_POINT_INLINE_BODY(cd, iptr);
+			linenumbertable_list_entry_add_inline_start(cd, iptr);
+			linenumbertable_list_entry_add(cd, iptr->line);
+			break;
+
+		case ICMD_INLINE_END:
+
+			linenumbertable_list_entry_add_inline_end(cd, iptr);
+			linenumbertable_list_entry_add(cd, iptr->line);
 			break;
 
 		case ICMD_CHECKNULL:  /* ..., objectref  ==> ..., objectref           */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			M_BEQZ(s1, 0);
-			codegen_add_nullpointerexception_ref(cd);
+			emit_nullpointer_check(cd, iptr, s1);
 			break;
 
 		/* constant operations ************************************************/
@@ -458,13 +429,10 @@ bool codegen(jitdata *jd)
 				/* XXX Only add the patcher, if this position needs to
 				   be patched.  If there was a previous position which
 				   resolved the same class, the returned displacement
-				   of dseg_addaddress is ok to use. */
-
-				codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
-									cr, disp);
+				   of dseg_add_address is ok to use. */
 
-				if (opt_showdisassemble)
-					M_NOP;
+				patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
+									  cr, disp);
 
 				M_ALD(d, REG_PV, disp);
 			}
@@ -488,24 +456,19 @@ bool codegen(jitdata *jd)
 		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:
 
-			M_COPY(iptr->s1.varindex, iptr->dst.varindex);
+			emit_copy(jd, iptr);
 			break;
+	
+		case ICMD_ASTORE:
 
-
-		/* pop operations *****************************************************/
-
-		/* attention: double and longs are only one entry in CACAO ICMDs      */
-
-		case ICMD_POP:        /* ..., value  ==> ...                          */
-		case ICMD_POP2:       /* ..., value, value  ==> ...                   */
-
+			if (!(iptr->flags.bits & INS_FLAG_RETADDR))
+				emit_copy(jd, iptr);
 			break;
 
 
@@ -587,6 +550,7 @@ bool codegen(jitdata *jd)
 			emit_store_dst(jd, iptr, d);
 			break;
 
+		case ICMD_IINC:
 		case ICMD_IADDCONST:  /* ..., value  ==> ..., value + constant        */
 		                      /* sx.val.i = constant                             */
 
@@ -594,7 +558,10 @@ bool codegen(jitdata *jd)
 			d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
 			if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 255)) {
 				M_IADD_IMM(s1, iptr->sx.val.i, d);
+			} else if ((iptr->sx.val.i > -256) && (iptr->sx.val.i < 0)) {
+				M_ISUB_IMM(s1, (-iptr->sx.val.i), d);
 			} else {
+				/* XXX maybe use M_LDA? */
 				ICONST(REG_ITMP2, iptr->sx.val.i);
 				M_IADD(s1, REG_ITMP2, d);
 			}
@@ -719,14 +686,13 @@ bool codegen(jitdata *jd)
 		case ICMD_IDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
 		case ICMD_IREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
 
-			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			s2 = emit_load_s2(jd, iptr, REG_ITMP2);
+			s1 = emit_load_s1(jd, iptr, REG_A0);
+			s2 = emit_load_s2(jd, iptr, REG_A1);
 			d = codegen_reg_of_dst(jd, iptr, REG_RESULT);
-			M_BEQZ(s2, 0);
-			codegen_add_arithmeticexception_ref(cd);
+			emit_arithmetic_check(cd, iptr, s2);
 
-			M_MOV(s1, REG_A0);
-			M_MOV(s2, REG_A1);
+			M_INTMOVE(s1, REG_A0);
+			M_INTMOVE(s2, REG_A1);
 			bte = iptr->sx.s23.s3.bte;
 			disp = dseg_add_functionptr(cd, bte->fp);
 			M_ALD(REG_PV, REG_PV, disp);
@@ -741,16 +707,14 @@ bool codegen(jitdata *jd)
 		case ICMD_LDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
 		case ICMD_LREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
 
-			bte = iptr->sx.s23.s3.bte;
-
 			s1 = emit_load_s1(jd, iptr, REG_A0);
 			s2 = emit_load_s2(jd, iptr, REG_A1);
 			d = codegen_reg_of_dst(jd, iptr, REG_RESULT);
-			M_BEQZ(s2, 0);
-			codegen_add_arithmeticexception_ref(cd);
+			emit_arithmetic_check(cd, iptr, s2);
 
 			M_INTMOVE(s1, REG_A0);
 			M_INTMOVE(s2, REG_A1);
+			bte = iptr->sx.s23.s3.bte;
 			disp = dseg_add_functionptr(cd, bte->fp);
 			M_ALD(REG_PV, REG_PV, disp);
 			M_JSR(REG_RA, REG_PV);
@@ -1128,25 +1092,6 @@ bool codegen(jitdata *jd)
 			break;
 
 
-		case ICMD_IINC:       /* ..., value  ==> ..., value + constant        */
-		                      /* s1.localindex = variable, sx.val.i = constant*/
-
-			d = codegen_reg_of_dst(jd, iptr, REG_ITMP1);
-			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-
-			if ((iptr->sx.val.i >= 0) && (iptr->sx.val.i <= 255)) {
-				M_IADD_IMM(s1, iptr->sx.val.i, d);
-			} else if ((iptr->sx.val.i > -256) && (iptr->sx.val.i < 0)) {
-				M_ISUB_IMM(s1, (-iptr->sx.val.i), d);
-			} else {
-				M_LDA (s1, s1, iptr->sx.val.i);
-				M_IADD(s1, REG_ZERO, d);
-			}
-
-			emit_store_dst(jd, iptr, d);
-			break;
-
-
 		/* floating operations ************************************************/
 
 		case ICMD_FNEG:       /* ..., value  ==> ..., - value                 */
@@ -1170,17 +1115,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_FADD(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_FADDS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_FADDS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_FADDS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_FADDS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1190,17 +1131,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_DADD(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_DADDS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_DADDS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_DADDS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_DADDS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1210,17 +1147,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_FSUB(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_FSUBS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_FSUBS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_FSUBS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_FSUBS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1230,17 +1163,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_DSUB(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_DSUBS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_DSUBS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_DSUBS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_DSUBS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1250,17 +1179,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_FMUL(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_FMULS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_FMULS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_FMULS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_FMULS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1270,17 +1195,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_DMUL(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_DMULS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_DMULS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_DMULS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_DMULS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1290,17 +1211,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_FDIV(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_FDIVS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_FDIVS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_FDIVS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_FDIVS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1310,17 +1227,13 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_DDIV(s1, s2, d);
+			if (d == s1 || d == s2) {
+				M_DDIVS(s1, s2, REG_FTMP3);
+				M_TRAPB;
+				M_FMOV(REG_FTMP3, d);
 			} else {
-				if (d == s1 || d == s2) {
-					M_DDIVS(s1, s2, REG_FTMP3);
-					M_TRAPB;
-					M_FMOV(REG_FTMP3, d);
-				} else {
-					M_DDIVS(s1, s2, d);
-					M_TRAPB;
-				}
+				M_DDIVS(s1, s2, d);
+				M_TRAPB;
 			}
 			emit_store_dst(jd, iptr, d);
 			break;
@@ -1329,7 +1242,7 @@ bool codegen(jitdata *jd)
 		case ICMD_L2F:
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			disp = dseg_add_unique_double(cd, 0.0);
+			disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */
 			M_LST(s1, REG_PV, disp);
 			M_DLD(d, REG_PV, disp);
 			M_CVTLF(d, d);
@@ -1340,7 +1253,7 @@ bool codegen(jitdata *jd)
 		case ICMD_L2D:
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			disp = dseg_add_unique_double(cd, 0.0);
+			disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */
 			M_LST(s1, REG_PV, disp);
 			M_DLD(d, REG_PV, disp);
 			M_CVTLD(d, d);
@@ -1351,7 +1264,7 @@ bool codegen(jitdata *jd)
 		case ICMD_D2I:
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-			disp = dseg_add_unique_double(cd, 0.0);
+			disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */
 			M_CVTDL_C(s1, REG_FTMP2);
 			M_CVTLI(REG_FTMP2, REG_FTMP3);
 			M_DST(REG_FTMP3, REG_PV, disp);
@@ -1363,7 +1276,7 @@ bool codegen(jitdata *jd)
 		case ICMD_D2L:
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-			disp = dseg_add_unique_double(cd, 0.0);
+			disp = dseg_add_unique_double(cd, 0.0); /* FIXME Not thread safe! */
 			M_CVTDL_C(s1, REG_FTMP2);
 			M_DST(REG_FTMP2, REG_PV, disp);
 			M_LLD(d, REG_PV, disp);
@@ -1383,12 +1296,8 @@ bool codegen(jitdata *jd)
 
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			d = codegen_reg_of_dst(jd, iptr, REG_FTMP3);
-			if (opt_noieee) {
-				M_CVTDF(s1, d);
-			} else {
-				M_CVTDFS(s1, d);
-				M_TRAPB;
-			}
+			M_CVTDFS(s1, d);
+			M_TRAPB;
 			emit_store_dst(jd, iptr, d);
 			break;
 		
@@ -1397,25 +1306,15 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-			if (opt_noieee) {
-				M_LSUB_IMM(REG_ZERO, 1, d);
-				M_FCMPEQ(s1, s2, REG_FTMP3);
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instructions */
-				M_CLR   (d);
-				M_FCMPLT(s2, s1, REG_FTMP3);
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
-				M_LADD_IMM(REG_ZERO, 1, d);
-			} else {
-				M_LSUB_IMM(REG_ZERO, 1, d);
-				M_FCMPEQS(s1, s2, REG_FTMP3);
-				M_TRAPB;
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instructions */
-				M_CLR   (d);
-				M_FCMPLTS(s2, s1, REG_FTMP3);
-				M_TRAPB;
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
-				M_LADD_IMM(REG_ZERO, 1, d);
-			}
+			M_LSUB_IMM(REG_ZERO, 1, d);
+			M_FCMPEQS(s1, s2, REG_FTMP3);
+			M_TRAPB;
+			M_FBEQZ (REG_FTMP3, 1);        /* jump over next instructions */
+			M_CLR   (d);
+			M_FCMPLTS(s2, s1, REG_FTMP3);
+			M_TRAPB;
+			M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
+			M_LADD_IMM(REG_ZERO, 1, d);
 			emit_store_dst(jd, iptr, d);
 			break;
 			
@@ -1424,25 +1323,15 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 			s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 			d = codegen_reg_of_dst(jd, iptr, REG_ITMP3);
-			if (opt_noieee) {
-				M_LADD_IMM(REG_ZERO, 1, d);
-				M_FCMPEQ(s1, s2, REG_FTMP3);
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
-				M_CLR   (d);
-				M_FCMPLT(s1, s2, REG_FTMP3);
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
-				M_LSUB_IMM(REG_ZERO, 1, d);
-			} else {
-				M_LADD_IMM(REG_ZERO, 1, d);
-				M_FCMPEQS(s1, s2, REG_FTMP3);
-				M_TRAPB;
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
-				M_CLR   (d);
-				M_FCMPLTS(s1, s2, REG_FTMP3);
-				M_TRAPB;
-				M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
-				M_LSUB_IMM(REG_ZERO, 1, d);
-			}
+			M_LADD_IMM(REG_ZERO, 1, d);
+			M_FCMPEQS(s1, s2, REG_FTMP3);
+			M_TRAPB;
+			M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
+			M_CLR   (d);
+			M_FCMPLTS(s1, s2, REG_FTMP3);
+			M_TRAPB;
+			M_FBEQZ (REG_FTMP3, 1);        /* jump over next instruction  */
+			M_LSUB_IMM(REG_ZERO, 1, d);
 			emit_store_dst(jd, iptr, d);
 			break;
 
@@ -1453,8 +1342,8 @@ bool codegen(jitdata *jd)
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
-			gen_nullptr_check(s1);
-			M_ILD(d, s1, OFFSET(java_arrayheader, size));
+			/* implicit null-pointer check */
+			M_ILD(d, s1, OFFSET(java_array_t, size));
 			emit_store_dst(jd, iptr, d);
 			break;
 
@@ -1463,18 +1352,17 @@ 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_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 (has_ext_instr_set) {
-				M_LADD   (s2, s1, REG_ITMP1);
-				M_BLDU   (d, REG_ITMP1, OFFSET (java_bytearray, data[0]));
-				M_BSEXT  (d, d);
-			} else {
 				M_LADD(s2, s1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0])+1);
+				M_BLDU(d, REG_ITMP1, OFFSET (java_bytearray_t, data[0]));
+				M_BSEXT(d, d);
+			}
+			else {
+				M_LADD(s2, s1, REG_ITMP1);
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray_t, data[0])+1);
 				M_EXTQH(REG_ITMP2, REG_ITMP1, d);
 				M_SRA_IMM(d, 56, d);
 			}
@@ -1486,19 +1374,18 @@ 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_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 (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_SLDU(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
-			} else {
+				M_SLDU(d, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
+			}
+			else {
 				M_LADD (s2, s1, REG_ITMP1);
 				M_LADD (s2, REG_ITMP1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0]));
-				M_LDA  (REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0]));
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
+				M_LDA  (REG_ITMP1, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
 				M_EXTWL(REG_ITMP2, REG_ITMP1, d);
 			}
 			emit_store_dst(jd, iptr, d);
@@ -1509,20 +1396,18 @@ 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_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 (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_SLDU( d, REG_ITMP1, OFFSET (java_shortarray, data[0]));
+				M_SLDU( d, REG_ITMP1, OFFSET (java_shortarray_t, data[0]));
 				M_SSEXT(d, d);
 			} else {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0])+2);
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray_t, data[0])+2);
 				M_EXTQH(REG_ITMP2, REG_ITMP1, d);
 				M_SRA_IMM(d, 48, d);
 			}
@@ -1534,12 +1419,10 @@ 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_ITMP2);
-			if (INSTRUCTION_MUST_CHECK(iptr)) {
-				gen_nullptr_check(s1);
-				gen_bound_check;
-			}
+			/* implicit null-pointer check */
+			emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
 			M_S4ADDQ(s2, s1, REG_ITMP1);
-			M_ILD(d, REG_ITMP1, OFFSET(java_intarray, data[0]));
+			M_ILD(d, REG_ITMP1, OFFSET(java_intarray_t, data[0]));
 			emit_store_dst(jd, iptr, d);
 			break;
 
@@ -1548,12 +1431,10 @@ 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_ITMP2);
-			if (INSTRUCTION_MUST_CHECK(iptr)) {
-				gen_nullptr_check(s1);
-				gen_bound_check;
-			}
+			/* implicit null-pointer check */
+			emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
 			M_S8ADDQ(s2, s1, REG_ITMP1);
-			M_LLD(d, REG_ITMP1, OFFSET(java_longarray, data[0]));
+			M_LLD(d, REG_ITMP1, OFFSET(java_longarray_t, data[0]));
 			emit_store_dst(jd, iptr, d);
 			break;
 
@@ -1562,12 +1443,10 @@ 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_FTMP2);
-			if (INSTRUCTION_MUST_CHECK(iptr)) {
-				gen_nullptr_check(s1);
-				gen_bound_check;
-			}
+			/* implicit null-pointer check */
+			emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
 			M_S4ADDQ(s2, s1, REG_ITMP1);
-			M_FLD(d, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+			M_FLD(d, REG_ITMP1, OFFSET(java_floatarray_t, data[0]));
 			emit_store_dst(jd, iptr, d);
 			break;
 
@@ -1576,12 +1455,10 @@ 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_FTMP2);
-			if (INSTRUCTION_MUST_CHECK(iptr)) {
-				gen_nullptr_check(s1);
-				gen_bound_check;
-			}
+			/* implicit null-pointer check */
+			emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
 			M_S8ADDQ(s2, s1, REG_ITMP1);
-			M_DLD(d, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+			M_DLD(d, REG_ITMP1, OFFSET(java_doublearray_t, data[0]));
 			emit_store_dst(jd, iptr, d);
 			break;
 
@@ -1590,12 +1467,10 @@ 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_ITMP2);
-			if (INSTRUCTION_MUST_CHECK(iptr)) {
-				gen_nullptr_check(s1);
-				gen_bound_check;
-			}
+			/* implicit null-pointer check */
+			emit_arrayindexoutofbounds_check(cd, iptr, s1, s2);
 			M_SAADDQ(s2, s1, REG_ITMP1);
-			M_ALD(d, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+			M_ALD(d, REG_ITMP1, OFFSET(java_objectarray_t, data[0]));
 			emit_store_dst(jd, iptr, d);
 			break;
 
@@ -1604,18 +1479,17 @@ 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);
 			if (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
-				M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
-			} else {
+				M_BST(s3, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
+			}
+			else {
 				M_LADD(s2, s1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
 				M_INSBL(s3, REG_ITMP1, REG_ITMP3);
 				M_MSKBL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
 				M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2);
@@ -1627,20 +1501,19 @@ 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);
 			if (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
-			} else {
+				M_SST(s3, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
+			}
+			else {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0]));
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
 				M_INSWL(s3, REG_ITMP1, REG_ITMP3);
 				M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
 				M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2);
@@ -1652,20 +1525,19 @@ 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);
 			if (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_SST(s3, REG_ITMP1, OFFSET(java_shortarray, data[0]));
-			} else {
+				M_SST(s3, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
+			}
+			else {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0]));
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
 				M_INSWL(s3, REG_ITMP1, REG_ITMP3);
 				M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
 				M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2);
@@ -1677,136 +1549,86 @@ 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);
 			M_S4ADDQ(s2, s1, REG_ITMP1);
-			M_IST(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
+			M_IST(s3, REG_ITMP1, OFFSET(java_intarray_t, data[0]));
 			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);
 			M_S8ADDQ(s2, s1, REG_ITMP1);
-			M_LST(s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
+			M_LST(s3, REG_ITMP1, OFFSET(java_longarray_t, data[0]));
 			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);
 			M_S4ADDQ(s2, s1, REG_ITMP1);
-			M_FST(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+			M_FST(s3, REG_ITMP1, OFFSET(java_floatarray_t, data[0]));
 			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);
 			M_S8ADDQ(s2, s1, REG_ITMP1);
-			M_DST(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+			M_DST(s3, REG_ITMP1, OFFSET(java_doublearray_t, data[0]));
 			break;
 
 		case ICMD_AASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
 			s1 = emit_load_s1(jd, iptr, REG_A0);
 			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_A1);
 
 			M_INTMOVE(s1, REG_A0);
 			M_INTMOVE(s3, REG_A1);
 
-			disp = dseg_add_functionptr(cd, BUILTIN_canstore);
+			disp = dseg_add_functionptr(cd, BUILTIN_FAST_canstore);
 			M_ALD(REG_PV, REG_PV, disp);
 			M_JSR(REG_RA, REG_PV);
 			disp = (s4) (cd->mcodeptr - cd->mcodebase);
 			M_LDA(REG_PV, REG_RA, -disp);
-
-			M_BEQZ(REG_RESULT, 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);
 			M_SAADDQ(s2, s1, REG_ITMP1);
-			M_AST(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
-			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;
-			}
-			M_S4ADDQ(s2, s1, REG_ITMP1);
-			M_IST(REG_ZERO, REG_ITMP1, OFFSET(java_intarray, data[0]));
-			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;
-			}
-			M_S8ADDQ(s2, s1, REG_ITMP1);
-			M_LST(REG_ZERO, REG_ITMP1, OFFSET(java_longarray, data[0]));
+			M_AST(s3, REG_ITMP1, OFFSET(java_objectarray_t, data[0]));
 			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;
-			}
-			M_SAADDQ(s2, s1, REG_ITMP1);
-			M_AST(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray, data[0]));
-			break;
 
 		case ICMD_BASTORECONST:   /* ..., 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 (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
-				M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray, data[0]));
-
-			} else {
+				M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
+			}
+			else {
 				M_LADD(s2, s1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_bytearray_t, data[0]));
 				M_INSBL(REG_ZERO, REG_ITMP1, REG_ITMP3);
 				M_MSKBL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
 				M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2);
@@ -1818,20 +1640,18 @@ 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);
 			if (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray, data[0]));
-
-			} else {
+				M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
+			}
+			else {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray, data[0]));
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_chararray_t, data[0]));
 				M_INSWL(REG_ZERO, REG_ITMP1, REG_ITMP3);
 				M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
 				M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2);
@@ -1843,20 +1663,18 @@ 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);
 			if (has_ext_instr_set) {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_shortarray, data[0]));
-
-			} else {
+				M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
+			}
+			else {
 				M_LADD(s2, s1, REG_ITMP1);
 				M_LADD(s2, REG_ITMP1, REG_ITMP1);
-				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray, data[0]));
-				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray, data[0]));
+				M_LLD_U(REG_ITMP2, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
+				M_LDA(REG_ITMP1, REG_ITMP1, OFFSET(java_shortarray_t, data[0]));
 				M_INSWL(REG_ZERO, REG_ITMP1, REG_ITMP3);
 				M_MSKWL(REG_ITMP2, REG_ITMP1, REG_ITMP2);
 				M_OR(REG_ITMP2, REG_ITMP3, REG_ITMP2);
@@ -1864,34 +1682,54 @@ bool codegen(jitdata *jd)
 			}
 			break;
 
+		case ICMD_IASTORECONST:   /* ..., arrayref, index  ==> ...            */
 
-		case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
+			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);
+			M_S4ADDQ(s2, s1, REG_ITMP1);
+			M_IST(REG_ZERO, REG_ITMP1, OFFSET(java_intarray_t, data[0]));
+			break;
 
-			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-				unresolved_field *uf = iptr->sx.s23.s3.uf;
+		case ICMD_LASTORECONST:   /* ..., arrayref, index  ==> ...            */
 
-				fieldtype = uf->fieldref->parseddesc.fd->type;
+			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);
+			M_S8ADDQ(s2, s1, REG_ITMP1);
+			M_LST(REG_ZERO, REG_ITMP1, OFFSET(java_longarray_t, data[0]));
+			break;
+
+		case ICMD_AASTORECONST:   /* ..., arrayref, index  ==> ...            */
 
-				disp = dseg_add_unique_address(cd, uf);
+			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);
+			M_SAADDQ(s2, s1, REG_ITMP1);
+			M_AST(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray_t, data[0]));
+			break;
 
-				codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
 
-				if (opt_showdisassemble)
-					M_NOP;
+		case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
+
+			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+				uf        = iptr->sx.s23.s3.uf;
+				fieldtype = uf->fieldref->parseddesc.fd->type;
+				disp      = dseg_add_unique_address(cd, uf);
+
+				patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
 			}
 			else {
-				fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+				fi        = iptr->sx.s23.s3.fmiref->p.field;
 				fieldtype = fi->type;
-				disp = dseg_add_address(cd, &(fi->value));
+				disp      = dseg_add_address(cd, fi->value);
 
-				if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
-					codegen_addpatchref(cd, PATCHER_initialize_class, fi->class,
-										0);
-
-					if (opt_showdisassemble)
-						M_NOP;
-				}
+				if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz))
+					patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz,
+										  0);
   			}
 
 			M_ALD(REG_ITMP1, REG_PV, disp);
@@ -1923,30 +1761,20 @@ bool codegen(jitdata *jd)
 		case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
 
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-				unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+				uf        = iptr->sx.s23.s3.uf;
 				fieldtype = uf->fieldref->parseddesc.fd->type;
+				disp      = dseg_add_unique_address(cd, uf);
 
-				disp = dseg_add_unique_address(cd, uf);
-
-				codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
-
-				if (opt_showdisassemble)
-					M_NOP;
+				patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
 			}
 			else {
-				fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+				fi        = iptr->sx.s23.s3.fmiref->p.field;
 				fieldtype = fi->type;
-				disp = dseg_add_address(cd, &(fi->value));
+				disp      = dseg_add_address(cd, fi->value);
 
-				if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
-					codegen_addpatchref(cd, PATCHER_initialize_class, fi->class,
-										0);
-
-					if (opt_showdisassemble)
-						M_NOP;
-				}
+				if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz))
+					patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz,
+										  0);
   			}
 
 			M_ALD(REG_ITMP1, REG_PV, disp);
@@ -1979,30 +1807,20 @@ bool codegen(jitdata *jd)
 		                          /* following NOP)                           */
 
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-				unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+				uf        = iptr->sx.s23.s3.uf;
 				fieldtype = uf->fieldref->parseddesc.fd->type;
+				disp      = dseg_add_unique_address(cd, uf);
 
-				disp = dseg_add_unique_address(cd, uf);
-
-				codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
-
-				if (opt_showdisassemble)
-					M_NOP;
+				patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
 			}
 			else {
-				fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+				fi        = iptr->sx.s23.s3.fmiref->p.field;
 				fieldtype = fi->type;
-				disp = dseg_add_address(cd, &(fi->value));
+				disp      = dseg_add_address(cd, fi->value);
 
-				if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
-					codegen_addpatchref(cd, PATCHER_initialize_class, fi->class,
-										0);
-
-					if (opt_showdisassemble)
-						M_NOP;
-				}
+				if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz))
+					patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz,
+										  0);
   			}
 			
 			M_ALD(REG_ITMP1, REG_PV, disp);
@@ -2029,27 +1847,21 @@ bool codegen(jitdata *jd)
 		case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			gen_nullptr_check(s1);
 
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-				unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+				uf        = iptr->sx.s23.s3.uf;
 				fieldtype = uf->fieldref->parseddesc.fd->type;
+				disp      = 0;
 
-				codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
-
-				if (opt_showdisassemble)
-					M_NOP;
-
-				disp = 0;
+				patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
 			}
 			else {
-				fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+				fi        = iptr->sx.s23.s3.fmiref->p.field;
 				fieldtype = fi->type;
-				disp = fi->offset;
+				disp      = fi->offset;
 			}
 
+			/* implicit null-pointer check */
 			switch (fieldtype) {
 			case TYPE_INT:
 				d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
@@ -2078,33 +1890,28 @@ bool codegen(jitdata *jd)
 		case ICMD_PUTFIELD:   /* ..., objectref, value  ==> ...               */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			gen_nullptr_check(s1);
-
-			if (!IS_FLT_DBL_TYPE(fieldtype)) {
-				s2 = emit_load_s2(jd, iptr, REG_ITMP2);
-			} else {
-				s2 = emit_load_s2(jd, iptr, REG_FTMP2);
-			}
 
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-				unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+				uf        = iptr->sx.s23.s3.uf;
 				fieldtype = uf->fieldref->parseddesc.fd->type;
-
-				codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
-
-				if (opt_showdisassemble)
-					M_NOP;
-
-				disp = 0;
+				disp      = 0;
 			}
 			else {
-				fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+				uf        = NULL;
+				fi        = iptr->sx.s23.s3.fmiref->p.field;
 				fieldtype = fi->type;
-				disp = fi->offset;
+				disp      = fi->offset;
 			}
 
+			if (IS_INT_LNG_TYPE(fieldtype))
+				s2 = emit_load_s2(jd, iptr, REG_ITMP2);
+			else
+				s2 = emit_load_s2(jd, iptr, REG_FTMP2);
+
+			if (INSTRUCTION_IS_UNRESOLVED(iptr))
+				patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
+
+			/* implicit null-pointer check */
 			switch (fieldtype) {
 			case TYPE_INT:
 				M_IST(s2, s1, disp);
@@ -2129,27 +1936,21 @@ bool codegen(jitdata *jd)
 		                          /* following NOP)                           */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			gen_nullptr_check(s1);
 
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-				unresolved_field *uf = iptr->sx.s23.s3.uf;
-
+				uf        = iptr->sx.s23.s3.uf;
 				fieldtype = uf->fieldref->parseddesc.fd->type;
+				disp      = 0;
 
-				codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
-
-				if (opt_showdisassemble)
-					M_NOP;
-
-				disp = 0;
+				patcher_add_patch_ref(jd, PATCHER_get_putfield, uf, 0);
 			}
 			else {
-				fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
-
+				fi        = iptr->sx.s23.s3.fmiref->p.field;
 				fieldtype = fi->type;
-				disp = fi->offset;
+				disp      = fi->offset;
 			}
 
+			/* implicit null-pointer check */
 			switch (fieldtype) {
 			case TYPE_INT:
 				M_IST(REG_ZERO, s1, disp);
@@ -2181,10 +1982,7 @@ bool codegen(jitdata *jd)
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
 				unresolved_class *uc = iptr->sx.s23.s2.uc;
 
-				codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
-
-				if (opt_showdisassemble)
-					M_NOP;
+				patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0);
 			}
 #endif /* ENABLE_VERIFIER */
 
@@ -2197,272 +1995,215 @@ bool codegen(jitdata *jd)
 			break;
 
 		case ICMD_GOTO:         /* ... ==> ...                                */
-			M_BR(0);
-			codegen_addreference(cd, iptr->dst.block);
+		case ICMD_RET:          /* ... ==> ...                                */
+
+			emit_br(cd, iptr->dst.block);
 			ALIGNCODENOP;
 			break;
 
 		case ICMD_JSR:          /* ... ==> ...                                */
 
-			M_BSR(REG_ITMP1, 0);
-			codegen_addreference(cd, iptr->sx.s23.s3.jsrtarget.block);
-			break;
-			
-		case ICMD_RET:          /* ... ==> ...                                */
-		                        /* s1.localindex = local variable                       */
-
-  			M_BR(0);
-			codegen_addreference(cd, iptr->dst.block);
-/* 			var = &(rd->locals[iptr->s1.localindex][TYPE_ADR]); */
-/* 			if (var->flags & INMEMORY) { */
-/* 				M_ALD(REG_ITMP1, REG_SP, 8 * var->vv.regoff); */
-/* 				M_RET(REG_ZERO, REG_ITMP1); */
-/* 				} */
-/* 			else */
-/* 				M_RET(REG_ZERO, var->vv.regoff); */
+			emit_br(cd, iptr->sx.s23.s3.jsrtarget.block);
 			ALIGNCODENOP;
 			break;
-
+			
 		case ICMD_IFNULL:       /* ..., value ==> ...                         */
+		case ICMD_IFNONNULL:
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			M_BEQZ(s1, 0);
-			codegen_addreference(cd, iptr->dst.block);
-			break;
-
-		case ICMD_IFNONNULL:    /* ..., value ==> ...                         */
-
-			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			M_BNEZ(s1, 0);
-			codegen_addreference(cd, iptr->dst.block);
+			emit_bccz(cd, iptr->dst.block, iptr->opc - ICMD_IFNULL, s1, BRANCH_OPT_NONE);
 			break;
 
 		case ICMD_IFEQ:         /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.i == 0) {
-				M_BEQZ(s1, 0);
-				}
+			if (iptr->sx.val.i == 0)
+				emit_beqz(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255)) {
+				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255))
 					M_CMPEQ_IMM(s1, iptr->sx.val.i, REG_ITMP1);
-					}
 				else {
 					ICONST(REG_ITMP2, iptr->sx.val.i);
 					M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BNEZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_bnez(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IFLT:         /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.i == 0) {
-				M_BLTZ(s1, 0);
-				}
+			if (iptr->sx.val.i == 0)
+				emit_bltz(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255)) {
+				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255))
 					M_CMPLT_IMM(s1, iptr->sx.val.i, REG_ITMP1);
-					}
 				else {
 					ICONST(REG_ITMP2, iptr->sx.val.i);
 					M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BNEZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_bnez(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IFLE:         /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.i == 0) {
-				M_BLEZ(s1, 0);
-				}
+			if (iptr->sx.val.i == 0)
+				emit_blez(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255)) {
+				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255))
 					M_CMPLE_IMM(s1, iptr->sx.val.i, REG_ITMP1);
-					}
 				else {
 					ICONST(REG_ITMP2, iptr->sx.val.i);
 					M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BNEZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_bnez(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IFNE:         /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.i == 0) {
-				M_BNEZ(s1, 0);
-				}
+			if (iptr->sx.val.i == 0)
+				emit_bnez(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255)) {
+				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255))
 					M_CMPEQ_IMM(s1, iptr->sx.val.i, REG_ITMP1);
-					}
 				else {
 					ICONST(REG_ITMP2, iptr->sx.val.i);
 					M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BEQZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_beqz(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IFGT:         /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.i == 0) {
-				M_BGTZ(s1, 0);
-				}
+			if (iptr->sx.val.i == 0)
+				emit_bgtz(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255)) {
+				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255))
 					M_CMPLE_IMM(s1, iptr->sx.val.i, REG_ITMP1);
-					}
 				else {
 					ICONST(REG_ITMP2, iptr->sx.val.i);
 					M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BEQZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_beqz(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IFGE:         /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.i == 0) {
-				M_BGEZ(s1, 0);
-				}
+			if (iptr->sx.val.i == 0)
+				emit_bgez(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255)) {
+				if ((iptr->sx.val.i > 0) && (iptr->sx.val.i <= 255))
 					M_CMPLT_IMM(s1, iptr->sx.val.i, REG_ITMP1);
-					}
 				else {
 					ICONST(REG_ITMP2, iptr->sx.val.i);
 					M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BEQZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_beqz(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IF_LEQ:       /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.l == 0) {
-				M_BEQZ(s1, 0);
-				}
+			if (iptr->sx.val.l == 0)
+				emit_beqz(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255)) {
+				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255))
 					M_CMPEQ_IMM(s1, iptr->sx.val.l, REG_ITMP1);
-					}
 				else {
 					LCONST(REG_ITMP2, iptr->sx.val.l);
 					M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BNEZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_bnez(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IF_LLT:       /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.l == 0) {
-				M_BLTZ(s1, 0);
-				}
+			if (iptr->sx.val.l == 0)
+				emit_bltz(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255)) {
+				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255))
 					M_CMPLT_IMM(s1, iptr->sx.val.l, REG_ITMP1);
-					}
 				else {
 					LCONST(REG_ITMP2, iptr->sx.val.l);
 					M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BNEZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_bnez(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IF_LLE:       /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.l == 0) {
-				M_BLEZ(s1, 0);
-				}
+			if (iptr->sx.val.l == 0)
+				emit_blez(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255)) {
+				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255))
 					M_CMPLE_IMM(s1, iptr->sx.val.l, REG_ITMP1);
-					}
 				else {
 					LCONST(REG_ITMP2, iptr->sx.val.l);
 					M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BNEZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_bnez(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IF_LNE:       /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.l == 0) {
-				M_BNEZ(s1, 0);
-				}
+			if (iptr->sx.val.l == 0)
+				emit_bnez(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255)) {
+				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255))
 					M_CMPEQ_IMM(s1, iptr->sx.val.l, REG_ITMP1);
-					}
 				else {
 					LCONST(REG_ITMP2, iptr->sx.val.l);
 					M_CMPEQ(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BEQZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_beqz(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IF_LGT:       /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.l == 0) {
-				M_BGTZ(s1, 0);
-				}
+			if (iptr->sx.val.l == 0)
+				emit_bgtz(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255)) {
+				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255))
 					M_CMPLE_IMM(s1, iptr->sx.val.l, REG_ITMP1);
-					}
 				else {
 					LCONST(REG_ITMP2, iptr->sx.val.l);
 					M_CMPLE(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BEQZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_beqz(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IF_LGE:       /* ..., value ==> ...                         */
 
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-			if (iptr->sx.val.l == 0) {
-				M_BGEZ(s1, 0);
-				}
+			if (iptr->sx.val.l == 0)
+				emit_bgez(cd, iptr->dst.block, s1);
 			else {
-				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255)) {
+				if ((iptr->sx.val.l > 0) && (iptr->sx.val.l <= 255))
 					M_CMPLT_IMM(s1, iptr->sx.val.l, REG_ITMP1);
-					}
 				else {
 					LCONST(REG_ITMP2, iptr->sx.val.l);
 					M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
-					}
-				M_BEQZ(REG_ITMP1, 0);
 				}
-			codegen_addreference(cd, iptr->dst.block);
+				emit_beqz(cd, iptr->dst.block, REG_ITMP1);
+			}
 			break;
 
 		case ICMD_IF_ICMPEQ:    /* ..., value, value ==> ...                  */
@@ -2472,8 +2213,7 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			s2 = emit_load_s2(jd, iptr, REG_ITMP2);
 			M_CMPEQ(s1, s2, REG_ITMP1);
-			M_BNEZ(REG_ITMP1, 0);
-			codegen_addreference(cd, iptr->dst.block);
+			emit_bnez(cd, iptr->dst.block, REG_ITMP1);
 			break;
 
 		case ICMD_IF_ICMPNE:    /* ..., value, value ==> ...                  */
@@ -2483,8 +2223,7 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			s2 = emit_load_s2(jd, iptr, REG_ITMP2);
 			M_CMPEQ(s1, s2, REG_ITMP1);
-			M_BEQZ(REG_ITMP1, 0);
-			codegen_addreference(cd, iptr->dst.block);
+			emit_beqz(cd, iptr->dst.block, REG_ITMP1);
 			break;
 
 		case ICMD_IF_ICMPLT:    /* ..., value, value ==> ...                  */
@@ -2493,8 +2232,7 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			s2 = emit_load_s2(jd, iptr, REG_ITMP2);
 			M_CMPLT(s1, s2, REG_ITMP1);
-			M_BNEZ(REG_ITMP1, 0);
-			codegen_addreference(cd, iptr->dst.block);
+			emit_bnez(cd, iptr->dst.block, REG_ITMP1);
 			break;
 
 		case ICMD_IF_ICMPGT:    /* ..., value, value ==> ...                  */
@@ -2503,8 +2241,7 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			s2 = emit_load_s2(jd, iptr, REG_ITMP2);
 			M_CMPLE(s1, s2, REG_ITMP1);
-			M_BEQZ(REG_ITMP1, 0);
-			codegen_addreference(cd, iptr->dst.block);
+			emit_beqz(cd, iptr->dst.block, REG_ITMP1);
 			break;
 
 		case ICMD_IF_ICMPLE:    /* ..., value, value ==> ...                  */
@@ -2513,8 +2250,7 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			s2 = emit_load_s2(jd, iptr, REG_ITMP2);
 			M_CMPLE(s1, s2, REG_ITMP1);
-			M_BNEZ(REG_ITMP1, 0);
-			codegen_addreference(cd, iptr->dst.block);
+			emit_bnez(cd, iptr->dst.block, REG_ITMP1);
 			break;
 
 		case ICMD_IF_ICMPGE:    /* ..., value, value ==> ...                  */
@@ -2523,20 +2259,21 @@ bool codegen(jitdata *jd)
 			s1 = emit_load_s1(jd, iptr, REG_ITMP1);
 			s2 = emit_load_s2(jd, iptr, REG_ITMP2);
 			M_CMPLT(s1, s2, REG_ITMP1);
-			M_BEQZ(REG_ITMP1, 0);
-			codegen_addreference(cd, iptr->dst.block);
+			emit_beqz(cd, iptr->dst.block, REG_ITMP1);
 			break;
 
 
 		case ICMD_IRETURN:      /* ..., retvalue ==> ...                      */
 		case ICMD_LRETURN:
 
+			REPLACEMENT_POINT_RETURN(cd, iptr);
 			s1 = emit_load_s1(jd, iptr, REG_RESULT);
 			M_INTMOVE(s1, REG_RESULT);
 			goto nowperformreturn;
 
 		case ICMD_ARETURN:      /* ..., retvalue ==> ...                      */
 
+			REPLACEMENT_POINT_RETURN(cd, iptr);
 			s1 = emit_load_s1(jd, iptr, REG_RESULT);
 			M_INTMOVE(s1, REG_RESULT);
 
@@ -2544,10 +2281,7 @@ bool codegen(jitdata *jd)
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
 				unresolved_class *uc = iptr->sx.s23.s2.uc;
 
-				codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
-
-				if (opt_showdisassemble)
-					M_NOP;
+				patcher_add_patch_ref(jd, PATCHER_resolve_class, uc, 0);
 			}
 #endif /* ENABLE_VERIFIER */
 			goto nowperformreturn;
@@ -2555,12 +2289,15 @@ bool codegen(jitdata *jd)
 		case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
 		case ICMD_DRETURN:
 
+			REPLACEMENT_POINT_RETURN(cd, iptr);
 			s1 = emit_load_s1(jd, iptr, REG_FRESULT);
 			M_FLTMOVE(s1, REG_FRESULT);
 			goto nowperformreturn;
 
 		case ICMD_RETURN:       /* ...  ==> ...                               */
 
+			REPLACEMENT_POINT_RETURN(cd, iptr);
+
 nowperformreturn:
 			{
 			s4 i, p;
@@ -2575,7 +2312,7 @@ nowperformreturn:
 #endif
 
 #if defined(ENABLE_THREADS)
-			if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+			if (checksync && code_is_synchronized(code)) {
 				M_ALD(REG_A0, REG_SP, rd->memuse * 8);
 
 				switch (iptr->opc) {
@@ -2612,7 +2349,7 @@ nowperformreturn:
 
 			/* restore return address                                         */
 
-			if (!jd->isleafmethod) {
+			if (!code_is_leafmethod(code)) {
 				p--; M_LLD(REG_RA, REG_SP, p * 8);
 			}
 
@@ -2667,8 +2404,7 @@ nowperformreturn:
 				M_LDA(REG_ITMP2, REG_ZERO, i - 1);
 				M_CMPULE(REG_ITMP1, REG_ITMP2, REG_ITMP2);
 			}
-			M_BEQZ(REG_ITMP2, 0);
-			codegen_addreference(cd, table[0].block);
+			emit_beqz(cd, table[0].block, REG_ITMP2);
 
 			/* build jump table top down and use address of lowest entry */
 
@@ -2714,15 +2450,11 @@ nowperformreturn:
 					}
 					M_CMPEQ(s1, REG_ITMP2, REG_ITMP2);
 				}
-				M_BNEZ(REG_ITMP2, 0);
-				codegen_addreference(cd, lookup->target.block);
+				emit_bnez(cd, lookup->target.block, REG_ITMP2);
 				lookup++;
 			}
 
-			M_BR(0);
-			
-			codegen_addreference(cd, iptr->sx.s23.s3.lookupdefault.block);
-
+			emit_br(cd, iptr->sx.s23.s3.lookupdefault.block);
 			ALIGNCODENOP;
 			break;
 			}
@@ -2730,6 +2462,8 @@ nowperformreturn:
 
 		case ICMD_BUILTIN:      /* ..., arg1, arg2, arg3 ==> ...              */
 
+			REPLACEMENT_POINT_FORGC_BUILTIN(cd, iptr);
+
 			bte = iptr->sx.s23.s3.bte;
 			md  = bte->md;
 			goto gen_method;
@@ -2740,6 +2474,8 @@ nowperformreturn:
 		case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer    */
 		case ICMD_INVOKEINTERFACE:
 
+			REPLACEMENT_POINT_INVOKE(cd, iptr);
+
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
 				lm = NULL;
 				um = iptr->sx.s23.s3.um;
@@ -2760,71 +2496,79 @@ gen_method:
 
 			for (s3 = s3 - 1; s3 >= 0; s3--) {
 				var = VAR(iptr->sx.s23.s2.args[s3]);
+				d   = md->params[s3].regoff;
+
+				/* already preallocated (ARGVAR)? */
 
-				/* 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);
+						s1 = emit_load(jd, iptr, var, d);
+						M_INTMOVE(s1, d);
 					}
 					else {
-						d = emit_load(jd, iptr, var, REG_ITMP1);
-						M_LST(d, REG_SP, md->params[s3].regoff * 8);
+						s1 = emit_load(jd, iptr, var, REG_ITMP1);
+						M_LST(s1, REG_SP, d);
 					}
 				}
 				else {
 					if (!md->params[s3].inmemory) {
-						s1 = rd->argfltregs[md->params[s3].regoff];
-						d = emit_load(jd, iptr, var, s1);
-						M_FLTMOVE(d, s1);
+						s1 = emit_load(jd, iptr, var, d);
+						M_FLTMOVE(s1, d);
 					}
 					else {
-						d = emit_load(jd, iptr, var, REG_FTMP1);
-						M_DST(d, REG_SP, md->params[s3].regoff * 8);
+						s1 = emit_load(jd, iptr, var, REG_FTMP1);
+						M_DST(s1, REG_SP, d);
 					}
 				}
 			}
 
 			switch (iptr->opc) {
 			case ICMD_BUILTIN:
-				disp = dseg_add_functionptr(cd, bte->fp);
+				if (bte->stub == NULL)
+					disp = dseg_add_functionptr(cd, bte->fp);
+				else
+					disp = dseg_add_functionptr(cd, bte->stub);
 
 				M_ALD(REG_PV, REG_PV, disp);  /* Pointer to built-in-function */
+
+				/* generate the actual call */
+
+				M_JSR(REG_RA, REG_PV);
+				REPLACEMENT_POINT_FORGC_BUILTIN_RETURN(cd, iptr);
+				disp = (s4) (cd->mcodeptr - cd->mcodebase);
+				M_LDA(REG_PV, REG_RA, -disp);
 				break;
 
 			case ICMD_INVOKESPECIAL:
-				M_BEQZ(REG_A0, 0);
-				codegen_add_nullpointerexception_ref(cd);
-				/* fall through */
+				emit_nullpointer_check(cd, iptr, REG_A0);
+				/* fall-through */
 
 			case ICMD_INVOKESTATIC:
 				if (lm == NULL) {
 					disp = dseg_add_unique_address(cd, um);
 
-					codegen_addpatchref(cd, PATCHER_invokestatic_special,
-										um, disp);
-
-					if (opt_showdisassemble)
-						M_NOP;
+					patcher_add_patch_ref(jd, PATCHER_invokestatic_special,
+										  um, disp);
 				}
 				else
 					disp = dseg_add_address(cd, lm->stubroutine);
 
 				M_ALD(REG_PV, REG_PV, disp);         /* method pointer in r27 */
+
+				/* generate the actual call */
+
+				M_JSR(REG_RA, REG_PV);
+				REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
+				disp = (s4) (cd->mcodeptr - cd->mcodebase);
+				M_LDA(REG_PV, REG_RA, -disp);
 				break;
 
 			case ICMD_INVOKEVIRTUAL:
-				gen_nullptr_check(REG_A0);
-
 				if (lm == NULL) {
-					codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
-
-					if (opt_showdisassemble)
-						M_NOP;
+					patcher_add_patch_ref(jd, PATCHER_invokevirtual, um, 0);
 
 					s1 = 0;
 				}
@@ -2832,48 +2576,44 @@ gen_method:
 					s1 = OFFSET(vftbl_t, table[0]) +
 						sizeof(methodptr) * lm->vftblindex;
 
-				M_ALD(REG_METHODPTR, REG_A0,
-					  OFFSET(java_objectheader, vftbl));
+				/* implicit null-pointer check */
+				M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
 				M_ALD(REG_PV, REG_METHODPTR, s1);
+
+				/* generate the actual call */
+
+				M_JSR(REG_RA, REG_PV);
+				REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
+				disp = (s4) (cd->mcodeptr - cd->mcodebase);
+				M_LDA(REG_PV, REG_RA, -disp);
 				break;
 
 			case ICMD_INVOKEINTERFACE:
-				gen_nullptr_check(REG_A0);
-
 				if (lm == NULL) {
-					codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
-
-					if (opt_showdisassemble)
-						M_NOP;
+					patcher_add_patch_ref(jd, PATCHER_invokeinterface, um, 0);
 
 					s1 = 0;
 					s2 = 0;
 				}
 				else {
 					s1 = OFFSET(vftbl_t, interfacetable[0]) -
-						sizeof(methodptr*) * lm->class->index;
+						sizeof(methodptr*) * lm->clazz->index;
 
-					s2 = sizeof(methodptr) * (lm - lm->class->methods);
+					s2 = sizeof(methodptr) * (lm - lm->clazz->methods);
 				}
 					
-				M_ALD(REG_METHODPTR, REG_A0,
-					  OFFSET(java_objectheader, vftbl));    
+				/* implicit null-pointer check */
+				M_ALD(REG_METHODPTR, REG_A0, OFFSET(java_object_t, vftbl));
 				M_ALD(REG_METHODPTR, REG_METHODPTR, s1);
 				M_ALD(REG_PV, REG_METHODPTR, s2);
-				break;
-			}
-
-			/* generate the actual call */
-
-			M_JSR(REG_RA, REG_PV);
-			disp = (s4) (cd->mcodeptr - cd->mcodebase);
-			M_LDA(REG_PV, REG_RA, -disp);
 
-			/* actually only used for ICMD_BUILTIN */
+				/* generate the actual call */
 
-			if (INSTRUCTION_MUST_CHECK(iptr)) {
-				M_BEQZ(REG_RESULT, 0);
-				codegen_add_fillinstacktrace_ref(cd);
+				M_JSR(REG_RA, REG_PV);
+				REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
+				disp = (s4) (cd->mcodeptr - cd->mcodebase);
+				M_LDA(REG_PV, REG_RA, -disp);
+				break;
 			}
 
 			/* store the return value */
@@ -2896,154 +2636,143 @@ gen_method:
 
 		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 = 6;
-				if (super == NULL)
-					s2 += opt_showdisassemble ? 1 : 0;
-
-				/* calculate class checkcast code size */
-
-				s3 = 9 /* 8 + (s1 == REG_ITMP1) */;
-				if (super == NULL)
-					s3 += opt_showdisassemble ? 1 : 0;
-
 				/* if class is not resolved, check which code to call */
 
 				if (super == NULL) {
-					M_BEQZ(s1, 4 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+					emit_label_beqz(cd, BRANCH_LABEL_1, s1);
 
 					disp = dseg_add_unique_s4(cd, 0);         /* super->flags */
 
-					codegen_addpatchref(cd, PATCHER_resolve_classref_to_flags,
-										iptr->sx.s23.s3.c.ref,
-										disp);
-
-					if (opt_showdisassemble)
-						M_NOP;
+					patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
+										  iptr->sx.s23.s3.c.ref,
+										  disp);
 
 					M_ILD(REG_ITMP2, REG_PV, disp);
 					disp = dseg_add_s4(cd, ACC_INTERFACE);
 					M_ILD(REG_ITMP3, REG_PV, disp);
 					M_AND(REG_ITMP2, REG_ITMP3, REG_ITMP2);
-					M_BEQZ(REG_ITMP2, s2 + 1);
+					emit_label_beqz(cd, BRANCH_LABEL_2, REG_ITMP2);
 				}
 
 				/* interface checkcast code */
 
 				if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
 					if (super == NULL) {
-						codegen_addpatchref(cd,
-											PATCHER_checkcast_instanceof_interface,
-											iptr->sx.s23.s3.c.ref,
-											0);
-
-						if (opt_showdisassemble)
-							M_NOP;
+						patcher_add_patch_ref(jd,
+											  PATCHER_checkcast_interface,
+											  iptr->sx.s23.s3.c.ref,
+											  0);
 					}
 					else
-						M_BEQZ(s1, s2);
+						emit_label_beqz(cd, BRANCH_LABEL_3, s1);
 
-					M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+					M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
 					M_ILD(REG_ITMP3, REG_ITMP2,
 						  OFFSET(vftbl_t, interfacetablelength));
 					M_LDA(REG_ITMP3, REG_ITMP3, -superindex);
-					M_BLEZ(REG_ITMP3, 0);
-					codegen_add_classcastexception_ref(cd, s1);
+					emit_classcast_check(cd, iptr, BRANCH_LE, REG_ITMP3, s1);
+
 					M_ALD(REG_ITMP3, REG_ITMP2,
 						  (s4) (OFFSET(vftbl_t, interfacetable[0]) -
 								superindex * sizeof(methodptr*)));
-					M_BEQZ(REG_ITMP3, 0);
-					codegen_add_classcastexception_ref(cd, s1);
+					emit_classcast_check(cd, iptr, BRANCH_EQ, REG_ITMP3, s1);
 
 					if (super == NULL)
-						M_BR(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) {
-						disp = dseg_add_unique_address(cd, NULL);
+						emit_label(cd, BRANCH_LABEL_2);
 
-						codegen_addpatchref(cd,
-											PATCHER_resolve_classref_to_vftbl,
-											iptr->sx.s23.s3.c.ref,
-											disp);
+						disp = dseg_add_unique_address(cd, NULL);
 
-						if (opt_showdisassemble)
-							M_NOP;
+						patcher_add_patch_ref(jd,
+											  PATCHER_resolve_classref_to_vftbl,
+											  iptr->sx.s23.s3.c.ref,
+											  disp);
 					}
 					else {
-						disp = dseg_add_address(cd, supervftbl);
+						disp = dseg_add_address(cd, super->vftbl);
 
-						M_BEQZ(s1, s3);
+						emit_label_beqz(cd, BRANCH_LABEL_5, s1);
 					}
 
-					M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
-					M_ALD(REG_ITMP3, REG_PV, disp);
-#if defined(ENABLE_THREADS)
-					codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-					M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
-					/*  				if (s1 != REG_ITMP1) { */
-					/*  					M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, baseval)); */
-					/*  					M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); */
-					/*  #if defined(ENABLE_THREADS) */
-					/*  					codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase); */
-					/*  #endif */
-					/*  					M_ISUB(REG_ITMP2, REG_ITMP1, REG_ITMP2); */
-
-					/*  				} else { */
-					M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, baseval));
-					M_ISUB(REG_ITMP2, REG_ITMP3, REG_ITMP2);
+					M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
 					M_ALD(REG_ITMP3, REG_PV, disp);
-					M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
-#if defined(ENABLE_THREADS)
-					codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-					/*  				} */
-					M_CMPULE(REG_ITMP2, REG_ITMP3, REG_ITMP3);
-					M_BEQZ(REG_ITMP3, 0);
-					codegen_add_classcastexception_ref(cd, s1);
+
+					if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
+						M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+						M_LADD(REG_ITMP1, REG_ITMP2, REG_ITMP1);
+						M_ALD(REG_ITMP1, REG_ITMP1, 0);
+						M_CMPEQ(REG_ITMP1, REG_ITMP3, REG_ITMP1);
+						emit_label_bnez(cd, BRANCH_LABEL_6, REG_ITMP1);  /* good */
+
+						if (super == NULL) {
+							M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+							M_CMPEQ_IMM(REG_ITMP1, OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP1);
+							emit_label_beqz(cd, BRANCH_LABEL_10, REG_ITMP1);  /* throw */
+						}
+
+						M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
+						M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, subtype_depth));
+						M_CMPLE(REG_ITMP1, REG_ITMP3, REG_ITMP3);
+						emit_label_beqz(cd, BRANCH_LABEL_9, REG_ITMP3);  /* throw */
+						/* reload */
+						M_ALD(REG_ITMP3, REG_PV, disp);
+						M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow));
+						M_S8ADDQ(REG_ITMP1, REG_ITMP2, REG_ITMP2);
+						M_ALD(REG_ITMP1, REG_ITMP2, -DISPLAY_SIZE*8);
+						M_CMPEQ(REG_ITMP1, REG_ITMP3, REG_ITMP1);
+						emit_label_bnez(cd, BRANCH_LABEL_7, REG_ITMP1);  /* 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_INTERN(s1, REG_ZERO, 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_ALD(REG_ITMP2, REG_ITMP2, super->vftbl->subtype_offset);
+						M_CMPEQ(REG_ITMP2, REG_ITMP3, REG_ITMP2);
+						emit_classcast_check(cd, iptr, BRANCH_EQ, REG_ITMP2, 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, s1);
@@ -3054,28 +2783,26 @@ gen_method:
 				s1 = emit_load_s1(jd, iptr, REG_A0);
 				M_INTMOVE(s1, REG_A0);
 
-				disp = dseg_addaddress(cd, iptr->sx.s23.s3.c.cls);
-
 				if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-					codegen_addpatchref(cd,
-										PATCHER_resolve_classref_to_classinfo,
-										iptr->sx.s23.s3.c.ref,
-										disp);
+					disp = dseg_add_unique_address(cd, NULL);
 
-					if (opt_showdisassemble)
-						M_NOP;
+					patcher_add_patch_ref(jd,
+										  PATCHER_resolve_classref_to_classinfo,
+										  iptr->sx.s23.s3.c.ref,
+										  disp);
 				}
+				else
+					disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
 
 				M_ALD(REG_A1, REG_PV, disp);
-				disp = dseg_addaddress(cd, BUILTIN_arraycheckcast);
+				disp = dseg_add_functionptr(cd, BUILTIN_arraycheckcast);
 				M_ALD(REG_PV, REG_PV, disp);
 				M_JSR(REG_RA, REG_PV);
 				disp = (s4) (cd->mcodeptr - cd->mcodebase);
 				M_LDA(REG_PV, REG_RA, -disp);
 
 				s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-				M_BEQZ(REG_RESULT, 0);
-				codegen_add_classcastexception_ref(cd, s1);
+				emit_classcast_check(cd, iptr, BRANCH_EQ, REG_RESULT, s1);
 
 				d = codegen_reg_of_dst(jd, iptr, s1);
 			}
@@ -3086,21 +2813,6 @@ 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;
@@ -3117,48 +2829,31 @@ gen_method:
 				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_MOV(s1, REG_ITMP1);
 				s1 = REG_ITMP1;
 			}
 
-			/* calculate interface instanceof code size */
-
-			s2 = 6;
-			if (super == NULL)
-				s2 += (d == REG_ITMP2 ? 1 : 0) + (opt_showdisassemble ? 1 : 0);
-
-			/* calculate class instanceof code size */
-
-			s3 = 7;
-			if (super == NULL)
-				s3 += (opt_showdisassemble ? 1 : 0);
-
 			/* if class is not resolved, check which code to call */
 
 			if (super == NULL) {
 				M_CLR(d);
-				M_BEQZ(s1, 4 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+				emit_label_beqz(cd, BRANCH_LABEL_1, s1);
 
 				disp = dseg_add_unique_s4(cd, 0);             /* super->flags */
 
-				codegen_addpatchref(cd, PATCHER_resolve_classref_to_flags,
-									iptr->sx.s23.s3.c.ref, disp);
-
-				if (opt_showdisassemble)
-					M_NOP;
+				patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_flags,
+									  iptr->sx.s23.s3.c.ref, disp);
 
 				M_ILD(REG_ITMP3, REG_PV, disp);
 
 				disp = dseg_add_s4(cd, ACC_INTERFACE);
 				M_ILD(REG_ITMP2, REG_PV, disp);
 				M_AND(REG_ITMP3, REG_ITMP2, REG_ITMP3);
-				M_BEQZ(REG_ITMP3, s2 + 1);
+				emit_label_beqz(cd, BRANCH_LABEL_2, REG_ITMP3);
 			}
 
 			/* interface instanceof code */
@@ -3170,19 +2865,16 @@ gen_method:
 					if (d == REG_ITMP2)
 						M_CLR(d);
 
-					codegen_addpatchref(cd,
-										PATCHER_checkcast_instanceof_interface,
-										iptr->sx.s23.s3.c.ref, 0);
-
-					if (opt_showdisassemble)
-						M_NOP;
+					patcher_add_patch_ref(jd,
+										  PATCHER_instanceof_interface,
+										  iptr->sx.s23.s3.c.ref, 0);
 				}
 				else {
 					M_CLR(d);
-					M_BEQZ(s1, s2);
+					emit_label_beqz(cd, BRANCH_LABEL_3, s1);
 				}
 
-				M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+				M_ALD(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
 				M_ILD(REG_ITMP3, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
 				M_LDA(REG_ITMP3, REG_ITMP3, -superindex);
 				M_BLEZ(REG_ITMP3, 2);
@@ -3192,43 +2884,87 @@ gen_method:
 				M_CMPULT(REG_ZERO, REG_ITMP1, d);      /* REG_ITMP1 != 0  */
 
 				if (super == NULL)
-					M_BR(s3);
+					emit_label_br(cd, BRANCH_LABEL_4);
+				else
+					emit_label(cd, BRANCH_LABEL_3);
 			}
 
 			/* class instanceof code */
 
 			if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
 				if (super == NULL) {
-					disp = dseg_add_unique_address(cd, NULL);
+					emit_label(cd, BRANCH_LABEL_2);
 
-					codegen_addpatchref(cd, PATCHER_resolve_classref_to_vftbl,
-										iptr->sx.s23.s3.c.ref,
-										disp);
+					disp = dseg_add_unique_address(cd, NULL);
 
-					if (opt_showdisassemble)
-						M_NOP;
+					patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_vftbl,
+										  iptr->sx.s23.s3.c.ref,
+										  disp);
 				}
 				else {
 					disp = dseg_add_address(cd, supervftbl);
 
 					M_CLR(d);
-					M_BEQZ(s1, s3);
+					emit_label_beqz(cd, BRANCH_LABEL_5, s1);
 				}
 
-				M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-				M_ALD(REG_ITMP2, REG_PV, disp);
-#if defined(ENABLE_THREADS)
-				codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-				M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
-				M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
-				M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
-#if defined(ENABLE_THREADS)
-				codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
-#endif
-				M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
-				M_CMPULE(REG_ITMP1, REG_ITMP2, d);
+				M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
+				M_ALD(REG_ITMP3, REG_PV, disp);
+
+				if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
+					M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+					M_LADD(REG_ITMP1, REG_ITMP2, REG_ITMP1);
+					M_ALD(REG_ITMP1, REG_ITMP1, 0);
+					M_CMPEQ(REG_ITMP1, REG_ITMP3, REG_ITMP1);
+					emit_label_beqz(cd, BRANCH_LABEL_8, REG_ITMP1);
+					ICONST(d, 1);
+					emit_label_br(cd, BRANCH_LABEL_6);  /* true */
+					emit_label(cd, BRANCH_LABEL_8);
+
+					if (super == NULL) {
+						M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+						M_CMPEQ_IMM(REG_ITMP1, OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP1);
+						emit_label_beqz(cd, BRANCH_LABEL_10, REG_ITMP1);  /* false */
+					}
+
+					M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
+
+					M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, subtype_depth));
+					M_CMPLE(REG_ITMP1, REG_ITMP3, REG_ITMP3);
+					emit_label_beqz(cd, BRANCH_LABEL_9, REG_ITMP3);  /* false */
+					/* reload */
+					M_ALD(REG_ITMP3, REG_PV, disp);
+					M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow));
+					M_S8ADDQ(REG_ITMP1, REG_ITMP2, REG_ITMP2);
+					M_ALD(REG_ITMP1, REG_ITMP2, -DISPLAY_SIZE*8);
+					M_CMPEQ(REG_ITMP1, REG_ITMP3, d);
+
+					if (d == REG_ITMP2)
+						emit_label_br(cd, BRANCH_LABEL_7);
+					emit_label(cd, BRANCH_LABEL_9);
+					if (super == NULL)
+						emit_label(cd, BRANCH_LABEL_10);
+					if (d == REG_ITMP2) {
+						M_CLR(d);
+
+						emit_label(cd, BRANCH_LABEL_7);
+					}
+					emit_label(cd, BRANCH_LABEL_6);
+				}
+				else {
+					M_ALD(REG_ITMP2, REG_ITMP2, super->vftbl->subtype_offset);
+					M_CMPEQ(REG_ITMP2, REG_ITMP3, 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;
@@ -3262,12 +2998,9 @@ gen_method:
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
 				disp = dseg_add_unique_address(cd, 0);
 
-				codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
-									iptr->sx.s23.s3.c.ref,
-									disp);
-
-				if (opt_showdisassemble)
-					M_NOP;
+				patcher_add_patch_ref(jd, PATCHER_resolve_classref_to_classinfo,
+									  iptr->sx.s23.s3.c.ref,
+									  disp);
 			}
 			else
 				disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
@@ -3288,8 +3021,7 @@ gen_method:
 
 			/* check for exception before result assignment */
 
-			M_BEQZ(REG_RESULT, 0);
-			codegen_add_fillinstacktrace_ref(cd);
+			emit_exception_check(cd, iptr);
 
 			d = codegen_reg_of_dst(jd, iptr, REG_RESULT);
 			M_INTMOVE(REG_RESULT, d);
@@ -3297,8 +3029,8 @@ gen_method:
 			break;
 
 		default:
-			*exceptionptr =
-				new_internalerror("Unknown ICMD %d", iptr->opc);
+			exceptions_throw_internalerror("Unknown ICMD %d during code generation",
+										   iptr->opc);
 			return false;
 	} /* switch */
 		
@@ -3307,17 +3039,9 @@ gen_method:
 	} /* if (bptr -> flags >= BBREACHED) */
 	} /* for basic block */
 
-	dseg_createlinenumbertable(cd);
-
-	/* generate stubs */
+	/* generate traps */
 
-	emit_exception_stubs(jd);
-	emit_patcher_stubs(jd);
-#if 0
-	emit_replacement_stubs(jd);
-#endif
-
-	codegen_finish(jd);
+	emit_patcher_traps(jd);
 
 	/* everything's ok */
 
@@ -3325,280 +3049,218 @@ gen_method:
 }
 
 
-/* createcompilerstub **********************************************************
-
-   Creates a stub routine which calls the compiler.
-	
-*******************************************************************************/
-
-#define COMPILERSTUB_DATASIZE    3 * SIZEOF_VOID_P
-#define COMPILERSTUB_CODESIZE    3 * 4
+/* 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;              /* code generation pointer            */
-
-	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();
-
-	cd = DNEW(codegendata);
-	cd->mcodeptr = s;
-
-	/* 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, REG_PV, -2 * 8);   /* load codeinfo pointer              */
-	M_ALD(REG_PV, REG_PV, -3 * 8);      /* load pointer to the compiler       */
-	M_JMP(REG_ZERO, REG_PV);            /* jump to the compiler               */
-
-#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.
-
-*******************************************************************************/
-
-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, disp;
-	s4            funcdisp;             /* displacement of the function       */
+	methoddesc  *md;
+	int          i, j;
+	int          t;
+	int          s1, s2;
+	int          disp;
 
 	/* 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 =
 		1 +                             /* return address                     */
-		sizeof(stackframeinfo) / SIZEOF_VOID_P +
+		sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
 		sizeof(localref_table) / SIZEOF_VOID_P +
 		1 +                             /* methodinfo for call trace          */
-		(md->paramcount > INT_ARG_CNT ? INT_ARG_CNT : md->paramcount) +
+		md->paramcount +
 		nmd->memuse;
 
 	/* create method header */
 
 	(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);                      /* IsSync          */
 	(void) dseg_add_unique_s4(cd, 0);                      /* IsLeaf          */
 	(void) dseg_add_unique_s4(cd, 0);                      /* IntSave         */
 	(void) dseg_add_unique_s4(cd, 0);                      /* FltSave         */
-	(void) dseg_addlinenumbertablesize(cd);
-	(void) dseg_add_unique_s4(cd, 0);                      /* ExTableSize     */
 
 	/* generate stub code */
 
 	M_LDA(REG_SP, REG_SP, -(cd->stackframesize * 8));
 	M_AST(REG_RA, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
 
-	/* call trace function */
+#if defined(ENABLE_GC_CACAO)
+	/* Save callee saved integer registers in stackframeinfo (GC may
+	   need to recover them during a collection). */
 
-#if !defined(NDEBUG)
-	if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-		emit_verbosecall_enter(jd);
-#endif
+	disp = cd->stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo_t) +
+		OFFSET(stackframeinfo_t, intregs);
 
-	/* get function address (this must happen before the stackframeinfo) */
-
-	funcdisp = dseg_add_functionptr(cd, f);
-
-#if !defined(WITH_STATIC_CLASSPATH)
-	if (f == NULL) {
-		codegen_addpatchref(cd, PATCHER_resolve_native_function, m, funcdisp);
-
-		if (opt_showdisassemble)
-			M_NOP;
-	}
+	for (i = 0; i < INT_SAV_CNT; i++)
+		M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 8);
 #endif
 
 	/* save integer and float argument registers */
 
-	for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) {
-		if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) {
-			M_LST(rd->argintregs[i], REG_SP, j * 8);
-			j++;
-		}
-	}
+	for (i = 0; i < md->paramcount; i++) {
+		if (!md->params[i].inmemory) {
+			s1 = md->params[i].regoff;
 
-	for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
-		if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
-			M_DST(rd->argfltregs[i], 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:
+				M_FST(s1, REG_SP, i * 8);
+				break;
+			case TYPE_DBL:
+				M_DST(s1, REG_SP, i * 8);
+				break;
+			}
 		}
 	}
 
 	/* prepare data structures for native function call */
 
-	M_LDA(REG_A0, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
+	M_MOV(REG_SP, REG_A0);
 	M_MOV(REG_PV, REG_A1);
-	M_LDA(REG_A2, REG_SP, cd->stackframesize * 8);
-	M_ALD(REG_A3, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
 	disp = dseg_add_functionptr(cd, codegen_start_native_call);
 	M_ALD(REG_PV, REG_PV, disp);
 	M_JSR(REG_RA, REG_PV);
 	disp = (s4) (cd->mcodeptr - cd->mcodebase);
 	M_LDA(REG_PV, REG_RA, -disp);
 
+	/* remember class argument */
+
+	if (m->flags & ACC_STATIC)
+		M_MOV(REG_RESULT, REG_ITMP3);
+
 	/* restore integer and float argument registers */
 
-	for (i = 0, j = 0; i < md->paramcount && i < INT_ARG_CNT; i++) {
-		if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) {
-			M_LLD(rd->argintregs[i], REG_SP, j * 8);
-			j++;
-		}
-	}
+	for (i = 0; i < md->paramcount; i++) {
+		if (!md->params[i].inmemory) {
+			s1 = md->params[i].regoff;
 
-	for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
-		if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
-			M_DLD(rd->argfltregs[i], 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:
+				M_FLD(s1, REG_SP, i * 8);
+				break;
+			case TYPE_DBL:
+				M_DLD(s1, REG_SP, i * 8);
+				break;
+			}
 		}
 	}
 
 	/* copy or spill arguments to new locations */
 
-	for (i = md->paramcount - 1, j = i + nativeparams; i >= 0; i--, j--) {
+	for (i = md->paramcount - 1, j = i + skipparams; i >= 0; i--, j--) {
 		t = md->paramtypes[i].type;
 
 		if (IS_INT_LNG_TYPE(t)) {
 			if (!md->params[i].inmemory) {
-				s1 = rd->argintregs[md->params[i].regoff];
+				s1 = md->params[i].regoff;
+				s2 = nmd->params[j].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;
+				else
+					M_LST(s1, REG_SP, s2);
+			}
+			else {
+				s1 = md->params[i].regoff + cd->stackframesize * 8;
 				s2 = nmd->params[j].regoff;
-				M_LLD(REG_ITMP1, REG_SP, s1 * 8);
-				M_LST(REG_ITMP1, REG_SP, s2 * 8);
+				M_LLD(REG_ITMP1, REG_SP, s1);
+				M_LST(REG_ITMP1, REG_SP, s2);
 			}
-
-		} else {
+		}
+		else {
 			if (!md->params[i].inmemory) {
-				s1 = rd->argfltregs[md->params[i].regoff];
+				s1 = md->params[i].regoff;
+				s2 = nmd->params[j].regoff;
 
-				if (!nmd->params[j].inmemory) {
-					s2 = rd->argfltregs[nmd->params[j].regoff];
+				if (!nmd->params[j].inmemory)
 					M_FLTMOVE(s1, s2);
-
-				} else {
-					s2 = nmd->params[j].regoff;
+				else {
 					if (IS_2_WORD_TYPE(t))
-						M_DST(s1, REG_SP, s2 * 8);
+						M_DST(s1, REG_SP, s2);
 					else
-						M_FST(s1, REG_SP, s2 * 8);
+						M_FST(s1, REG_SP, s2);
 				}
-
-			} else {
-				s1 = md->params[i].regoff + cd->stackframesize;
+			}
+			else {
+				s1 = md->params[i].regoff + cd->stackframesize * 8;
 				s2 = nmd->params[j].regoff;
-				M_DLD(REG_FTMP1, REG_SP, s1 * 8);
+				M_DLD(REG_FTMP1, REG_SP, s1);
 				if (IS_2_WORD_TYPE(t))
-					M_DST(REG_FTMP1, REG_SP, s2 * 8);
+					M_DST(REG_FTMP1, REG_SP, s2);
 				else
-					M_FST(REG_FTMP1, REG_SP, s2 * 8);
+					M_FST(REG_FTMP1, REG_SP, s2);
 			}
 		}
 	}
 
-	/* put class into second argument register */
+	/* Handle native Java methods. */
 
-	if (m->flags & ACC_STATIC) {
-		disp = dseg_add_address(cd, m->class);
-		M_ALD(REG_A1, REG_PV, disp);
-	}
+	if (m->flags & ACC_NATIVE) {
+		/* put class into second argument register */
+
+		if (m->flags & ACC_STATIC)
+			M_MOV(REG_ITMP3, REG_A1);
 
-	/* put env into first argument register */
+		/* put env into first argument register */
 
-	disp = dseg_add_address(cd, _Jv_env);
-	M_ALD(REG_A0, REG_PV, disp);
+		disp = dseg_add_address(cd, VM_get_jnienv());
+		M_ALD(REG_A0, REG_PV, disp);
+	}
 
-	/* do the native function call */
+	/* Call the native function. */
 
-	M_ALD(REG_PV, REG_PV, funcdisp);
+	disp = dseg_add_functionptr(cd, f);
+	M_ALD(REG_PV, REG_PV, disp);
 	M_JSR(REG_RA, REG_PV);              /* call native method                 */
 	disp = (s4) (cd->mcodeptr - cd->mcodebase);
 	M_LDA(REG_PV, REG_RA, -disp);       /* recompute pv from ra               */
 
 	/* 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:
+		M_LST(REG_RESULT, REG_SP, 0 * 8);
+		break;
+	case TYPE_FLT:
+		M_FST(REG_FRESULT, REG_SP, 0 * 8);
+		break;
+	case TYPE_DBL:
+		M_DST(REG_FRESULT, REG_SP, 0 * 8);
+		break;
+	case TYPE_VOID:
+		break;
 	}
 
-	/* call finished trace */
-
-#if !defined(NDEBUG)
-	if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-		emit_verbosecall_exit(jd);
-#endif
-
 	/* remove native stackframe info */
 
-	M_LDA(REG_A0, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
+	M_MOV(REG_SP, REG_A0);
+	M_MOV(REG_PV, REG_A1);
 	disp = dseg_add_functionptr(cd, codegen_finish_native_call);
 	M_ALD(REG_PV, REG_PV, disp);
 	M_JSR(REG_RA, REG_PV);
@@ -3608,13 +3270,33 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 
 	/* 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:
+		M_FLD(REG_FRESULT, REG_SP, 0 * 8);
+		break;
+	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_VOID_P - 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
+
 	M_ALD(REG_RA, REG_SP, (cd->stackframesize - 1) * 8); /* get RA            */
 	M_LDA(REG_SP, REG_SP, cd->stackframesize * 8);
 
@@ -3630,15 +3312,6 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 	disp = dseg_add_functionptr(cd, asm_handle_nat_exception);
 	M_ALD(REG_ITMP3, REG_PV, disp);     /* load asm exception handler address */
 	M_JMP(REG_ZERO, REG_ITMP3);         /* jump to asm exception handler      */
-	
-
-	/* generate patcher stubs */
-
-	emit_patcher_stubs(jd);
-
-	codegen_finish(jd);
-
-	return code->entrypoint;
 }