* src/vm/jit/code.c (code_get_stack_frame_size): Implement stack alignment
[cacao.git] / src / vm / jit / mips / codegen.c
index 1cc831dd78f338263c965c117af37f2ca74585eb..19fa69dd6998ce433d3767f39a78422f69279d8a 100644 (file)
@@ -1,10 +1,9 @@
-/* jit/mips/codegen.c - machine code generator for mips
+/* src/vm/jit/mips/codegen.c - machine code generator for MIPS
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Institut f. Computersprachen, TU Wien
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
-   S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
-   J. Wenninger
+   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
 
    This file is part of CACAO.
 
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Andreas Krall
             Reinhard Grafl
 
+   Changes: Christian Thalinger
+            Christian Ullrich
+            Edwin Steiner
+
    Contains the codegenerator for an MIPS (R4000 or higher) processor.
    This module generates MIPS machine code for a sequence of
    intermediate code commands (ICMDs).
 
-   $Id: codegen.c 1271 2004-07-03 10:35:42Z stefan $
-
-*/
-
-
-#include <stdio.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include "types.h"
-#include "main.h"
-#include "codegen.h"
-#include "jit.h"
-#include "reg.h"
-#include "builtin.h"
-#include "asmpart.h"
-#include "jni.h"
-#include "loader.h"
-#include "tables.h"
-#include "native.h"
-
-/* include independent code generation stuff */
-#include "codegen.inc"
-#include "reg.inc"
-
-
-/* *****************************************************************************
-
-Datatypes and Register Allocations:
------------------------------------ 
-
-On 64-bit-machines (like the MIPS) all operands are stored in the
-registers in a 64-bit form, even when the correspondig JavaVM operands
-only need 32 bits. This is done by a canonical representation:
-
-32-bit integers are allways stored as sign-extended 64-bit values (this
-approach is directly supported by the MIPS architecture and is very easy
-to implement).
-
-32-bit-floats are stored in a 64-bit double precision register by simply
-expanding the exponent and mantissa with zeroes. (also supported by the
-architecture)
-
-
-Stackframes:
-
-The calling conventions and the layout of the stack is  explained in detail
-in the documention file: calling.doc
-
-*******************************************************************************/
-
-
-/* register descripton - array ************************************************/
-
-/* #define REG_RES   0         reserved register for OS or code generator     */
-/* #define REG_RET   1         return value register                          */
-/* #define REG_EXC   2         exception value register (only old jit)        */
-/* #define REG_SAV   3         (callee) saved register                        */
-/* #define REG_TMP   4         scratch temporary register (caller saved)      */
-/* #define REG_ARG   5         argument register (caller saved)               */
-
-/* #define REG_END   -1        last entry in tables */
-int nregdescint[] = {
-       REG_RES, REG_RES, REG_RET, REG_RES, REG_ARG, REG_ARG, REG_ARG, REG_ARG, 
-       REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_TMP, REG_TMP, REG_TMP, REG_TMP, 
-       REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV,
-       REG_TMP, REG_RES, REG_RES, REG_RES, REG_RES, REG_RES, REG_RES, REG_RES,
-       REG_END };
-
-/* for use of reserved registers, see comment above */
-       
-int nregdescfloat[] = {
-       REG_RET, REG_RES, REG_RES, REG_RES, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
-       REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_ARG, REG_ARG, REG_ARG, REG_ARG, 
-       REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
-       REG_SAV, REG_TMP, REG_SAV, REG_TMP, REG_SAV, REG_TMP, REG_SAV, REG_TMP,
-       REG_END };
-
-/* for use of reserved registers, see comment above */
-
-
-/* parameter allocation mode */
-
-int nreg_parammode = PARAMMODE_NUMBERED;  
-
-   /* parameter-registers will be allocated by assigning the
-      1. parameter:   int/float-reg a0
-      2. parameter:   int/float-reg a1  
-      3. parameter:   int/float-reg a2 ....
-   */
-
-
-/* stackframe-infos ***********************************************************/
-
-int parentargs_base; /* offset in stackframe for the parameter from the caller*/
+   $Id: codegen.c 4654 2006-03-19 19:46:11Z edwin $
 
-/* -> see file 'calling.doc' */
-
-
-/* additional functions and macros to generate code ***************************/
-
-/* #define BlockPtrOfPC(pc)        block+block_index[pc] */
-#define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
-
-
-#ifdef STATISTICS
-#define COUNT_SPILLS count_spills++
-#else
-#define COUNT_SPILLS
-#endif
-
-
-/* gen_nullptr_check(objreg) */
-
-#define gen_nullptr_check(objreg) \
-    if (checknull) { \
-        M_BEQZ((objreg), 0); \
-        codegen_addxnullrefs(mcodeptr); \
-        M_NOP; \
-    }
-
-
-/* MCODECHECK(icnt) */
-
-#define MCODECHECK(icnt) \
-       if ((mcodeptr + (icnt)) > mcodeend) mcodeptr = codegen_increase((u1 *) mcodeptr)
-
-/* M_INTMOVE:
-     generates an integer-move from register a to b.
-     if a and b are the same int-register, no code will be generated.
-*/ 
-
-#define M_INTMOVE(a,b) if (a != b) { M_MOV(a, b); }
-
-
-/* M_FLTMOVE:
-    generates a floating-point-move from register a to b.
-    if a and b are the same float-register, no code will be generated
-*/ 
-
-#define M_FLTMOVE(a,b) if (a != b) { M_DMOV(a, b); }
-
-#define M_TFLTMOVE(t,a,b) \
-       {if(a!=b) \
-               if ((t)==TYPE_DBL) \
-                   {M_DMOV(a,b);} \
-               else {M_FMOV(a,b);} \
-       }
-
-#define M_TFLD(t,a,b,disp) \
-    if ((t)==TYPE_DBL) \
-         {M_DLD(a,b,disp);} \
-    else \
-         {M_FLD(a,b,disp);}
-
-#define M_TFST(t,a,b,disp) \
-    if ((t)==TYPE_DBL) \
-         {M_DST(a,b,disp);} \
-    else \
-         {M_FST(a,b,disp);}
-
-#define M_CCFLTMOVE(t1,t2,a,b) \
-       if ((t1)==(t2)) \
-         {M_TFLTMOVE(t1,a,b);} \
-       else \
-         if ((t1)==TYPE_DBL) \
-               {M_CVTDF(a,b);} \
-         else \
-               {M_CVTFD(a,b);}
-
-#define M_CCFLD(t1,t2,a,b,disp) \
-    if ((t1)==(t2)) \
-         {M_DLD(a,b,disp);} \
-       else { \
-         M_DLD(REG_FTMP1,b,disp); \
-         if ((t1)==TYPE_DBL) \
-           {M_CVTDF(REG_FTMP1,a);} \
-         else \
-           {M_CVTFD(REG_FTMP1,a);} \
-       }
-         
-#define M_CCFST(t1,t2,a,b,disp) \
-    if ((t1)==(t2)) \
-         {M_DST(a,b,disp);} \
-       else { \
-         if ((t1)==TYPE_DBL) \
-           {M_CVTDF(a,REG_FTMP1);} \
-         else \
-           {M_CVTFD(a,REG_FTMP1);} \
-         M_DST(REG_FTMP1,b,disp); \
-       }
-         
-
-/* var_to_reg_xxx:
-    this function generates code to fetch data from a pseudo-register
-    into a real register. 
-    If the pseudo-register has actually been assigned to a real 
-    register, no code will be emitted, since following operations
-    can use this register directly.
-    
-    v: pseudoregister to be fetched from
-    tempregnum: temporary register to be used if v is actually spilled to ram
-
-    return: the register number, where the operand can be found after 
-            fetching (this wil be either tempregnum or the register
-            number allready given to v)
 */
 
-#define var_to_reg_int(regnr,v,tempnr) { \
-       if ((v)->flags & INMEMORY) \
-               {COUNT_SPILLS;M_LLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
-       else regnr=(v)->regoff; \
-}
-
-
-#define var_to_reg_flt(regnr,v,tempnr) { \
-       if ((v)->flags & INMEMORY) \
-               {COUNT_SPILLS;M_DLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
-       else regnr=(v)->regoff; \
-}
-
-
-/* reg_of_var:
-    This function determines a register, to which the result of an operation
-    should go, when it is ultimatively intended to store the result in
-    pseudoregister v.
-    If v is assigned to an actual register, this register will be returned.
-    Otherwise (when v is spilled) this function returns tempregnum.
-    If not already done, regoff and flags are set in the stack location.
-*/        
-
-static int reg_of_var(stackptr v, int tempregnum)
-{
-       varinfo      *var;
-
-       switch (v->varkind) {
-               case TEMPVAR:
-                       if (!(v->flags & INMEMORY))
-                               return(v->regoff);
-                       break;
-               case STACKVAR:
-                       var = &(interfaces[v->varnum][v->type]);
-                       v->regoff = var->regoff;
-                       if (!(var->flags & INMEMORY))
-                               return(var->regoff);
-                       break;
-               case LOCALVAR:
-                       var = &(locals[v->varnum][v->type]);
-                       v->regoff = var->regoff;
-                       if (!(var->flags & INMEMORY))
-                               return(var->regoff);
-                       break;
-               case ARGVAR:
-                       v->regoff = v->varnum;
-                       if (IS_FLT_DBL_TYPE(v->type)) {
-                               if (v->varnum < fltreg_argnum) {
-                                       v->regoff = argfltregs[v->varnum];
-                                       return(argfltregs[v->varnum]);
-                                       }
-                               }
-                       else
-                               if (v->varnum < intreg_argnum) {
-                                       v->regoff = argintregs[v->varnum];
-                                       return(argintregs[v->varnum]);
-                                       }
-                       v->regoff -= intreg_argnum;
-                       break;
-               }
-       v->flags |= INMEMORY;
-       return tempregnum;
-}
-
-
-/* store_reg_to_var_xxx:
-    This function generates the code to store the result of an operation
-    back into a spilled pseudo-variable.
-    If the pseudo-variable has not been spilled in the first place, this 
-    function will generate nothing.
-    
-    v ............ Pseudovariable
-    tempregnum ... Number of the temporary registers as returned by
-                   reg_of_var.
-*/     
-
-#define store_reg_to_var_int(sptr, tempregnum) {       \
-       if ((sptr)->flags & INMEMORY) {                    \
-               COUNT_SPILLS;                                  \
-               M_LST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
-               }                                              \
-       }
-
-#define store_reg_to_var_flt(sptr, tempregnum) {       \
-       if ((sptr)->flags & INMEMORY) {                    \
-               COUNT_SPILLS;                                  \
-               M_DST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
-               }                                              \
-       }
-
-
-/* NullPointerException handlers and exception handling initialisation        */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-void thread_restartcriticalsection(ucontext_t *uc)
-{
-       void *critical;
-       if ((critical = thread_checkcritical((void*) uc->uc_mcontext.gregs[CTX_EPC])) != NULL)
-               uc->uc_mcontext.gregs[CTX_EPC] = (u8) critical;
-}
-#endif
-
-/* NullPointerException signal handler for hardware null pointer check */
-
-void catch_NullPointerException(int sig, int code, struct sigcontext *sigctx)
-{
-       sigset_t nsig;
-       int      instr;
-       long     faultaddr;
-       java_objectheader *xptr;
-
-       /* Reset signal handler - necessary for SysV, does no harm for BSD */
-
-       instr = *((int*)(sigctx->sc_pc));
-       faultaddr = sigctx->sc_regs[(instr >> 21) & 0x1f];
-
-       if (faultaddr == 0) {
-               sigemptyset(&nsig);
-               sigaddset(&nsig, sig);
-               sigprocmask(SIG_UNBLOCK, &nsig, NULL);           /* unblock signal    */
-               
-               xptr = new_exception(string_java_lang_NullPointerException);
-
-
-               sigctx->sc_regs[REG_ITMP1_XPTR] = (u8) xptr;
-               sigctx->sc_regs[REG_ITMP2_XPC] = sigctx->sc_pc;
-               sigctx->sc_pc = (u8) asm_handle_exception;
-
-       } else {
-        faultaddr += (long) ((instr << 16) >> 16);
-               fprintf(stderr, "faulting address: 0x%lx at 0x%lx\n", (long) faultaddr, (long) sigctx->sc_pc);
-               panic("Stack overflow");
-       }
-}
-
-
-#include <sys/fpu.h>
 
-void init_exceptions(void)
-{
-       struct sigaction sa;
-       sigset_t unblockmask;
-
-       /* The Boehm GC initialization blocks the SIGSEGV signal. So we do a
-          dummy allocation here to ensure that the GC is initialized.
-       */
-       heap_allocate(1, 0, NULL);
-
-       /* install signal handlers we need to convert to exceptions */
+#include "config.h"
 
-       sigemptyset(&unblockmask);
-       sa.sa_flags = 0;
-       sa.sa_sigaction = catch_NullPointerException;
-       sigemptyset(&sa.sa_mask);
-
-       if (!checknull) {
-#if defined(SIGSEGV)
-               sigaction(SIGSEGV, &sa, NULL);
-               sigaddset(&unblockmask, SIGSEGV);
-#endif
+#include <assert.h>
+#include <stdio.h>
 
-#if defined(SIGBUS)
-               sigaction(SIGBUS, &sa, NULL);
-               sigaddset(&unblockmask, SIGBUS);
+#include "vm/types.h"
+
+#include "md.h"
+#include "md-abi.h"
+
+#include "vm/jit/mips/arch.h"
+#include "vm/jit/mips/codegen.h"
+
+#include "native/native.h"
+#include "vm/builtin.h"
+#include "vm/class.h"
+#include "vm/exceptions.h"
+#include "vm/options.h"
+#include "vm/stringlocal.h"
+#include "vm/vm.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/codegen-common.h"
+#include "vm/jit/dseg.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/patcher.h"
+#include "vm/jit/reg.h"
+#include "vm/jit/replace.h"
+
+#if defined(ENABLE_LSRA)
+# include "vm/jit/allocator/lsra.h"
 #endif
-       }
 
-       sigprocmask(SIG_UNBLOCK, &unblockmask, NULL);
-
-       /* Turn off flush-to-zero */
-       {
-               union fpc_csr n;
-               n.fc_word = get_fpc_csr();
-               n.fc_struct.flush = 0;
-               set_fpc_csr(n.fc_word);
-       }
-}
 
+/* codegen *********************************************************************
 
-/* function gen_mcode **********************************************************
-
-       generates machine code
+   Generates machine code.
 
 *******************************************************************************/
 
-void codegen()
+bool codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 {
-       int  len, s1, s2, s3, d;
-       s4   a;
-       s4          *mcodeptr;
-       stackptr    src;
-       varinfo     *var;
-       basicblock  *bptr;
-       instruction *iptr;
-       xtable *ex;
+       s4                  len, s1, s2, s3, d, disp;
+       ptrint              a;
+       s4                  parentargs_base;
+       s4                 *mcodeptr;
+       stackptr            src;
+       varinfo            *var;
+       basicblock         *bptr;
+       instruction        *iptr;
+       exceptiontable     *ex;
+       u2                  currentline;
+       methodinfo         *lm;             /* local methodinfo for ICMD_INVOKE*  */
+       builtintable_entry *bte;
+       methoddesc         *md;
+       rplpoint           *replacementpoint;
 
        {
-       int p, pa, t, l, r;
+       s4 i, p, t, l;
+       s4 savedregs_num;
 
-       savedregs_num = (isleafmethod) ? 0 : 1;           /* space to save the RA */
+       savedregs_num = (m->isleafmethod) ? 0 : 1;        /* space to save the RA */
 
        /* space to save used callee saved registers */
 
-       savedregs_num += (savintregcnt - maxsavintreguse);
-       savedregs_num += (savfltregcnt - maxsavfltreguse);
+       savedregs_num += (INT_SAV_CNT - rd->savintreguse);
+       savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);
 
-       parentargs_base = maxmemuse + savedregs_num;
+       parentargs_base = rd->memuse + savedregs_num;
 
 #if defined(USE_THREADS)           /* space to save argument of monitor_enter */
-
-       if (checksync && (method->flags & ACC_SYNCHRONIZED))
+       if (checksync && (m->flags & ACC_SYNCHRONIZED))
                parentargs_base++;
-
 #endif
 
        /* adjust frame size for 16 byte alignment */
@@ -463,317 +121,389 @@ void codegen()
 
        /* create method header */
 
-#if POINTERSIZE==4
-       (void) dseg_addaddress(method);                         /* Filler         */
+#if SIZEOF_VOID_P == 4
+       (void) dseg_addaddress(cd, m);                          /* Filler         */
 #endif
-       (void) dseg_addaddress(method);                         /* MethodPointer  */
-       (void) dseg_adds4(parentargs_base * 8);                 /* FrameSize      */
+       (void) dseg_addaddress(cd, m);                          /* MethodPointer  */
+       (void) dseg_adds4(cd, parentargs_base * 8);             /* FrameSize      */
 
 #if defined(USE_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 && (method->flags & ACC_SYNCHRONIZED))
-               (void) dseg_adds4((maxmemuse + 1) * 8);             /* IsSync         */
+       if (checksync && (m->flags & ACC_SYNCHRONIZED))
+               (void) dseg_adds4(cd, (rd->memuse + 1) * 8);        /* IsSync         */
        else
-
 #endif
-
-               (void) dseg_adds4(0);                               /* IsSync         */
+               (void) dseg_adds4(cd, 0);                           /* IsSync         */
                                               
-       (void) dseg_adds4(isleafmethod);                        /* IsLeaf         */
-       (void) dseg_adds4(savintregcnt - maxsavintreguse);      /* IntSave        */
-       (void) dseg_adds4(savfltregcnt - maxsavfltreguse);      /* FltSave        */
-       (void) dseg_adds4(exceptiontablelength);                /* ExTableSize    */
+       (void) dseg_adds4(cd, m->isleafmethod);                 /* IsLeaf         */
+       (void) dseg_adds4(cd, INT_SAV_CNT - rd->savintreguse);  /* IntSave        */
+       (void) dseg_adds4(cd, FLT_SAV_CNT - rd->savfltreguse);  /* FltSave        */
+       dseg_addlinenumbertablesize(cd);
+       (void) dseg_adds4(cd, cd->exceptiontablelength);        /* ExTableSize    */
 
        /* create exception table */
 
-       for (ex = extable; ex != NULL; ex = ex->down) {
-               dseg_addtarget(ex->start);
-               dseg_addtarget(ex->end);
-               dseg_addtarget(ex->handler);
-               (void) dseg_addaddress(ex->catchtype);
+       for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
+               dseg_addtarget(cd, ex->start);
+               dseg_addtarget(cd, ex->end);
+               dseg_addtarget(cd, ex->handler);
+               (void) dseg_addaddress(cd, ex->catchtype.cls);
        }
        
        /* initialize mcode variables */
        
-       mcodeptr = (s4*) mcodebase;
-       mcodeend = (s4*) (mcodebase + mcodesize);
-       MCODECHECK(128 + mparamcount);
+       mcodeptr = (s4 *) cd->mcodeptr;
+
+       /* initialize the last patcher pointer */
+
+       cd->lastmcodeptr = (u1 *) mcodeptr;
 
        /* create stack frame (if necessary) */
 
        if (parentargs_base)
-               {M_LDA(REG_SP, REG_SP, -parentargs_base * 8);}
+               M_LDA(REG_SP, REG_SP, -parentargs_base * 8);
 
        /* save return address and used callee saved registers */
 
        p = parentargs_base;
-       if (!isleafmethod)
-               {p--; M_LST(REG_RA, REG_SP, 8*p);}
-       for (r = savintregcnt - 1; r >= maxsavintreguse; r--)
-               {p--; M_LST(savintregs[r], REG_SP, 8 * p);}
-       for (r = savfltregcnt - 1; r >= maxsavfltreguse; r--)
-               {p--; M_DST(savfltregs[r], REG_SP, 8 * p);}
+       if (!m->isleafmethod) {
+               p--; M_AST(REG_RA, REG_SP, p * 8);
+       }
+       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+               p--; M_AST(rd->savintregs[i], REG_SP, p * 8);
+       }
+       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+               p--; M_DST(rd->savfltregs[i], REG_SP, p * 8);
+       }
+
+       /* take arguments out of register or stack frame */
+
+       md = m->parseddesc;
+
+       for (p = 0, l = 0; p < md->paramcount; p++) {
+               t = md->paramtypes[p].type;
+               var = &(rd->locals[l][t]);
+               l++;
+               if (IS_2_WORD_TYPE(t))    /* increment local counter for 2 word types */
+                       l++;
+               if (var->type < 0)
+                       continue;
+               s1 = md->params[p].regoff;
+               if (IS_INT_LNG_TYPE(t)) {                    /* integer args          */
+                       if (!md->params[p].inmemory) {           /* register arguments    */
+                               s2 = rd->argintregs[s1];
+                               if (!(var->flags & INMEMORY)) {      /* reg arg -> register   */
+                                       M_INTMOVE(s2, var->regoff);
+                               } else {                             /* reg arg -> spilled    */
+                                       M_LST(s2, REG_SP, var->regoff * 8);
+                               }
+
+                       } else {                                 /* stack arguments       */
+                               if (!(var->flags & INMEMORY)) {      /* stack arg -> register */
+                                       M_LLD(var->regoff, REG_SP, (parentargs_base + s1) * 8);
+                               } else {                             /* stack arg -> spilled  */
+                                       var->regoff = parentargs_base + s1;
+                               }
+                       }
+
+               } else {                                     /* floating args         */
+                       if (!md->params[p].inmemory) {           /* register arguments    */
+                               s2 = rd->argfltregs[s1];
+                               if (!(var->flags & INMEMORY)) {      /* reg arg -> register   */
+                                       M_TFLTMOVE(var->type, s2, var->regoff);
+                               } else {                                         /* reg arg -> spilled    */
+                                       M_DST(s2, REG_SP, var->regoff * 8);
+                               }
+
+                       } else {                                 /* stack arguments       */
+                               if (!(var->flags & INMEMORY)) {      /* stack-arg -> register */
+                                       M_DLD(var->regoff, REG_SP, (parentargs_base + s1) * 8);
+                               } else {                             /* stack-arg -> spilled  */
+                                       var->regoff = parentargs_base + s1;
+                               }
+                       }
+               }
+       } /* end for */
 
-       /* save monitorenter argument */
+       /* call monitorenter function */
 
 #if defined(USE_THREADS)
-       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-               if (method->flags & ACC_STATIC) {
-                       p = dseg_addaddress(class);
-                       M_ALD(REG_ITMP1, REG_PV, p);
-                       M_AST(REG_ITMP1, REG_SP, maxmemuse * 8);
+       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+               /* stack offset for monitor argument */
+
+               s1 = rd->memuse;
+
+               if (opt_verbosecall) {
+                       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);
+
+                       for (p = 0; p < FLT_ARG_CNT; p++)
+                               M_DST(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
+
+                       s1 += INT_ARG_CNT + FLT_ARG_CNT;
+               }
+
+               /* decide which monitor enter function to call */
+
+               if (m->flags & ACC_STATIC) {
+                       p = dseg_addaddress(cd, m->class);
+                       M_ALD(rd->argintregs[0], REG_PV, p);
+                       p = dseg_addaddress(cd, BUILTIN_staticmonitorenter);
+                       M_ALD(REG_ITMP3, REG_PV, p);
+                       M_JSR(REG_RA, REG_ITMP3);
+                       M_AST(rd->argintregs[0], REG_SP, s1 * 8);         /* branch delay */
 
                } else {
-                       M_AST(argintregs[0], REG_SP, maxmemuse * 8);
+                       M_BEQZ(rd->argintregs[0], 0);
+                       codegen_add_nullpointerexception_ref(cd, mcodeptr);
+                       p = dseg_addaddress(cd, BUILTIN_monitorenter);
+                       M_ALD(REG_ITMP3, REG_PV, p);
+                       M_JSR(REG_RA, REG_ITMP3);
+                       M_AST(rd->argintregs[0], REG_SP, s1 * 8);         /* branch delay */
+               }
+
+               if (opt_verbosecall) {
+                       for (p = 0; p < INT_ARG_CNT; p++)
+                               M_LLD(rd->argintregs[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_LDA(REG_SP, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT) * 8);
                }
-       }                       
+       }
 #endif
 
-       /* copy argument registers to stack and call trace function with pointer
-          to arguments on stack. ToDo: save floating point registers !!!!!!!!!
-       */
+       /* copy argument registers to stack and call trace function */
 
-       if (runverbose) {
-               M_LDA(REG_SP, REG_SP, -(18 * 8));
-               M_LST(REG_RA, REG_SP, 1 * 8);
+       if (opt_verbosecall) {
+               M_LDA(REG_SP, REG_SP, -(2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT) * 8);
+               M_AST(REG_RA, REG_SP, 1 * 8);
 
                /* save integer argument registers */
-               for (p = 0; p < mparamcount && p < INT_ARG_CNT; p++) {
-                       M_LST(argintregs[p], REG_SP,  (2 + p) * 8);
-               }
+
+               for (p = 0; p < md->paramcount && p < INT_ARG_CNT; p++)
+                       M_LST(rd->argintregs[p], REG_SP, (2 + p) * 8);
 
                /* save and copy float arguments into integer registers */
-               for (p = 0; p < mparamcount && p < FLT_ARG_CNT; p++) {
-                       t = mparamtypes[p];
+
+               for (p = 0; p < md->paramcount && p < FLT_ARG_CNT; p++) {
+                       t = md->paramtypes[p].type;
 
                        if (IS_FLT_DBL_TYPE(t)) {
                                if (IS_2_WORD_TYPE(t)) {
-                                       M_DST(argfltregs[p], REG_SP, (10 + p) * 8);
-                                       M_LLD(argintregs[p], REG_SP, (10 + p) * 8);
+                                       M_DST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
+                                       M_LLD(rd->argintregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
 
                                } else {
-                                       M_FST(argfltregs[p], REG_SP, (10 + p) * 8);
-                                       M_ILD(argintregs[p], REG_SP, (10 + p) * 8);
+                                       M_FST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
+                                       M_ILD(rd->argintregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
                                }
 
                        } else {
-                               M_DST(argfltregs[p], REG_SP, (10 + p) * 8);
+                               M_DST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
                        }
                }
 
-               p = dseg_addaddress(method);
+               /* save temporary registers for leaf methods */
+
+               if (m->isleafmethod) {
+                       for (p = 0; p < INT_TMP_CNT; p++)
+                               M_LST(rd->tmpintregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + p) * 8);
+
+                       for (p = 0; p < FLT_TMP_CNT; p++)
+                               M_DST(rd->tmpfltregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + p) * 8);
+               }
+
+               p = dseg_addaddress(cd, m);
                M_ALD(REG_ITMP1, REG_PV, p);
-               M_LST(REG_ITMP1, REG_SP, 0);
-               p = dseg_addaddress((void *) builtin_trace_args);
-               M_ALD(REG_ITMP3, REG_PV, p);
+               M_AST(REG_ITMP1, REG_SP, 0 * 8);
+               disp = dseg_addaddress(cd, (void *) builtin_trace_args);
+               M_ALD(REG_ITMP3, REG_PV, disp);
                M_JSR(REG_RA, REG_ITMP3);
                M_NOP;
 
-               M_LLD(REG_RA, REG_SP, 1 * 8);
+               M_ALD(REG_RA, REG_SP, 1 * 8);
 
-               for (p = 0; p < mparamcount && p < INT_ARG_CNT; p++) {
-                       M_LLD(argintregs[p], REG_SP, (2 + p) * 8);
-               }
+               /* restore integer argument registers */
+
+               for (p = 0; p < md->paramcount && p < INT_ARG_CNT; p++)
+                       M_LLD(rd->argintregs[p], REG_SP, (2 + p) * 8);
+
+               /* restore float argument registers */
 
-               for (p = 0; p < mparamcount && p < FLT_ARG_CNT; p++) {
-                       t = mparamtypes[p];
+               for (p = 0; p < md->paramcount && p < FLT_ARG_CNT; p++) {
+                       t = md->paramtypes[p].type;
 
                        if (IS_FLT_DBL_TYPE(t)) {
                                if (IS_2_WORD_TYPE(t)) {
-                                       M_DLD(argfltregs[p], REG_SP, (10 + p) * 8);
+                                       M_DLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
+
                                } else {
-                                       M_FLD(argfltregs[p], REG_SP, (10 + p) * 8);
+                                       M_FLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
                                }
+
                        } else {
-                               M_DLD(argfltregs[p], REG_SP, (10 + p) * 8);
+                               M_DLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
                        }
                }
 
-               M_LDA(REG_SP, REG_SP, 18 * 8);
-       }
-
-       /* take arguments out of register or stack frame */
-
-       for (p = 0, l = 0; p < mparamcount; p++) {
-               t = mparamtypes[p];
-               var = &(locals[l][t]);
-               l++;
-               if (IS_2_WORD_TYPE(t))    /* increment local counter for 2 word types */
-                       l++;
-               if (var->type < 0)
-                       continue;
-               r = var->regoff; 
-               if (IS_INT_LNG_TYPE(t)) {                    /* integer args          */
-                       if (p < INT_ARG_CNT) {                   /* register arguments    */
-                               if (!(var->flags & INMEMORY))        /* reg arg -> register   */
-                                       {M_INTMOVE (argintregs[p], r);}
-                               else                                 /* reg arg -> spilled    */
-                                       M_LST (argintregs[p], REG_SP, 8 * r);
-                               }
-                       else {                                   /* stack arguments       */
-                               pa = p - INT_ARG_CNT;
-                               if (!(var->flags & INMEMORY))        /* stack arg -> register */ 
-                                       M_LLD (r, REG_SP, 8 * (parentargs_base + pa));
-                               else {                               /* stack arg -> spilled  */
-                                       M_LLD (REG_ITMP1, REG_SP, 8 * (parentargs_base + pa));
-                                       M_LST (REG_ITMP1, REG_SP, 8 * r);
-                                       }
-                               }
-                       }
-               else {                                       /* floating args         */   
-                       if (p < FLT_ARG_CNT) {                   /* register arguments    */
-                               if (!(var->flags & INMEMORY))        /* reg arg -> register   */
-                                       {M_TFLTMOVE (var->type, argfltregs[p], r);}
-                               else                                             /* reg arg -> spilled    */
-                                       M_DST (argfltregs[p], REG_SP, 8 * r);
-                               }
-                       else {                                   /* stack arguments       */
-                               pa = p - FLT_ARG_CNT;
-                               if (!(var->flags & INMEMORY)) {      /* stack-arg -> register */
-                                       M_DLD (r, REG_SP, 8 * (parentargs_base + pa) );
-                               } else {                             /* stack-arg -> spilled  */
-                                       M_DLD (REG_FTMP1, REG_SP, 8 * (parentargs_base + pa));
-                                       M_DST (REG_FTMP1, REG_SP, 8 * r);
-                                       }
-                               }
-                       }
-               }  /* end for */
+               /* restore temporary registers for leaf methods */
 
-       /* call trace function */
+               if (m->isleafmethod) {
+                       for (p = 0; p < INT_TMP_CNT; p++)
+                               M_LLD(rd->tmpintregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + p) * 8);
 
-#if 0
-       if (runverbose && !isleafmethod) {
-               M_LDA (REG_SP, REG_SP, -8);
-               p = dseg_addaddress (method);
-               M_ALD(REG_ITMP1, REG_PV, p);
-               M_AST(REG_ITMP1, REG_SP, 0);
-               p = dseg_addaddress ((void*) (builtin_trace_args));
-               M_ALD(REG_ITMP3, REG_PV, p);
-               M_JSR(REG_RA, REG_ITMP3);
-               M_NOP;
-               M_LDA(REG_SP, REG_SP, 8);
+                       for (p = 0; p < FLT_TMP_CNT; p++)
+                               M_DLD(rd->tmpfltregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + p) * 8);
                }
-#endif
 
-       /* call monitorenter function */
-
-#if defined(USE_THREADS)
-       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-               s4 disp;
-               s8 func_enter = (method->flags & ACC_STATIC) ?
-                       (s8) builtin_staticmonitorenter : (s8) builtin_monitorenter;
-               p = dseg_addaddress((void *) func_enter);
-               M_ALD(REG_ITMP3, REG_PV, p);
-               M_JSR(REG_RA, REG_ITMP3);
-               M_ALD(argintregs[0], REG_SP, maxmemuse * 8);
-               disp = -(s4)((u1 *) mcodeptr - mcodebase);
-               M_LDA(REG_PV, REG_RA, disp);
+               M_LDA(REG_SP, REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT) * 8);
        }
-#endif
+
        }
 
        /* end of header generation */
 
+       replacementpoint = cd->code->rplpoints;
+
        /* walk through all basic blocks */
-       for (bptr = block; bptr != NULL; bptr = bptr->next) {
 
-               bptr -> mpc = (int)((u1*) mcodeptr - mcodebase);
+       for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
 
-               if (bptr->flags >= BBREACHED) {
+               /* handle replacement points */
 
-               /* branch resolving */
+               if (bptr->bitflags & BBFLAG_REPLACEMENT && bptr->flags >= BBREACHED) {
 
-               {
-               branchref *brefs;
-               for (brefs = bptr->branchrefs; brefs != NULL; brefs = brefs->next) {
-                       gen_resolvebranch((u1*) mcodebase + brefs->branchpos, 
-                                         brefs->branchpos, bptr->mpc);
+                       /* 8-byte align pc */
+                       if ((ptrint)mcodeptr & 4) {
+                               M_NOP;
                        }
+                       
+                       replacementpoint->pc = (u1*)(ptrint)((u1*)mcodeptr - cd->mcodebase);
+                       replacementpoint++;
+
+                       assert(cd->lastmcodeptr <= (u1*)mcodeptr);
+                       cd->lastmcodeptr = (u1*)cd->mcodeptr + 2*4; /* br + delay slot */
                }
 
+               /* store relative start of block */
+
+               bptr->mpc = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+
+               if (bptr->flags >= BBREACHED) {
+
+                       /* branch resolving */
+                       {
+                               branchref *bref;
+                               for (bref = bptr->branchrefs; bref != NULL; bref = bref->next) {
+                                       gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
+                                                                         bref->branchpos,
+                                                                         bptr->mpc);
+                               }
+                       }
+
                /* copy interface registers to their destination */
 
                src = bptr->instack;
                len = bptr->indepth;
                MCODECHECK(64+len);
+#if defined(ENABLE_LSRA)
+               if (opt_lsra) {
                while (src != NULL) {
                        len--;
                        if ((len == 0) && (bptr->type != BBTYPE_STD)) {
-                               d = reg_of_var(src, REG_ITMP1);
+                                       /*                              d = reg_of_var(m, src, REG_ITMP1); */
+                                       if (!(src->flags & INMEMORY))
+                                               d= src->regoff;
+                                       else
+                                               d=REG_ITMP1;
+                                       M_INTMOVE(REG_ITMP1, d);
+                                       store_reg_to_var_int(src, d);
+                               }
+                               src = src->prev;
+                       }
+               } else {
+#endif
+               while (src != NULL) {
+                       len--;
+                       if ((len == 0) && (bptr->type != BBTYPE_STD)) {
+                               d = reg_of_var(rd, src, REG_ITMP1);
                                M_INTMOVE(REG_ITMP1, d);
                                store_reg_to_var_int(src, d);
-                               }
-                       else {
-                               d = reg_of_var(src, REG_IFTMP);
+
+                       else {
+                               d = reg_of_var(rd, src, REG_IFTMP);
                                if ((src->varkind != STACKVAR)) {
                                        s2 = src->type;
                                        if (IS_FLT_DBL_TYPE(s2)) {
-                                               if (!(interfaces[len][s2].flags & INMEMORY)) {
-                                                       s1 = interfaces[len][s2].regoff;
-                                                       M_TFLTMOVE(s2,s1,d);
-                                                       }
-                                               else {
-                                                       M_DLD(d, REG_SP, 8 * interfaces[len][s2].regoff);
-                                                       }
-                                               store_reg_to_var_flt(src, d);
+                                               if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+                                                       s1 = rd->interfaces[len][s2].regoff;
+                                                       M_TFLTMOVE(s2, s1, d);
+
+                                               } else {
+                                                       M_DLD(d, REG_SP, rd->interfaces[len][s2].regoff * 8);
                                                }
-                                       else {
-                                               if (!(interfaces[len][s2].flags & INMEMORY)) {
-                                                       s1 = interfaces[len][s2].regoff;
+                                               store_reg_to_var_flt(src, d);
+
+                                       } else {
+                                               if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+                                                       s1 = rd->interfaces[len][s2].regoff;
                                                        M_INTMOVE(s1,d);
-                                                       }
-                                               else {
-                                                       M_LLD(d, REG_SP, 8 * interfaces[len][s2].regoff);
-                                                       }
-                                               store_reg_to_var_int(src, d);
+
+                                               } else {
+                                                       M_LLD(d, REG_SP, rd->interfaces[len][s2].regoff * 8);
                                                }
+                                               store_reg_to_var_int(src, d);
                                        }
                                }
-                       src = src->prev;
                        }
-
+                       src = src->prev;
+               }
+#if defined(ENABLE_LSRA)
+               }
+#endif
                /* walk through all instructions */
                
                src = bptr->instack;
                len = bptr->icount;
-               for (iptr = bptr->iinstr;
-                   len > 0;
-                   src = iptr->dst, len--, iptr++) {
+               currentline = 0;
+
+               for (iptr = bptr->iinstr; len > 0; src = iptr->dst, len--, iptr++) {
+                       if (iptr->line != currentline) {
+                               dseg_addlinenumber(cd, iptr->line, (u1 *) mcodeptr);
+                               currentline = iptr->line;
+                       }
+
+                       MCODECHECK(64);   /* an instruction usually needs < 64 words      */
 
-       MCODECHECK(64);           /* an instruction usually needs < 64 words      */
-       switch (iptr->opc) {
+                       switch (iptr->opc) {
 
                case ICMD_NOP:        /* ...  ==> ...                                 */
                        break;
 
-               case ICMD_NULLCHECKPOP: /* ..., objectref  ==> ...                    */
+               case ICMD_CHECKNULL:  /* ..., objectref  ==> ..., objectref           */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
                        M_BEQZ(s1, 0);
-                       codegen_addxnullrefs(mcodeptr);
+                       codegen_add_nullpointerexception_ref(cd, mcodeptr);
                        M_NOP;
                        break;
 
                /* constant operations ************************************************/
 
-#define ICONST(r,c) if(((c)>=-32768)&&((c)<= 32767)){M_IADD_IMM(REG_ZERO,c,r);} \
-                    else if(((c)>=0)&&((c)<=0xffff)){M_OR_IMM(REG_ZERO,c,r);} \
-                    else{a=dseg_adds4(c);M_ILD(r,REG_PV,a);}
-
-#define LCONST(r,c) if(((c)>=-32768)&&((c)<= 32767)){M_LADD_IMM(REG_ZERO,c,r);} \
-                    else if(((c)>=0)&&((c)<=0xffff)){M_OR_IMM(REG_ZERO,c,r);} \
-                    else{a=dseg_adds8(c);M_LLD(r,REG_PV,a);}
-
                case ICMD_ICONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.i = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        ICONST(d, iptr->val.i);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -781,7 +511,7 @@ void codegen()
                case ICMD_LCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.l = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        LCONST(d, iptr->val.l);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -789,68 +519,85 @@ void codegen()
                case ICMD_FCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.f = constant                    */
 
-                       d = reg_of_var (iptr->dst, REG_FTMP1);
-                       a = dseg_addfloat (iptr->val.f);
-                       M_FLD(d, REG_PV, a);
-                       store_reg_to_var_flt (iptr->dst, d);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                       disp = dseg_addfloat(cd, iptr->val.f);
+                       M_FLD(d, REG_PV, disp);
+                       store_reg_to_var_flt(iptr->dst, d);
                        break;
                        
                case ICMD_DCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.d = constant                    */
 
-                       d = reg_of_var (iptr->dst, REG_FTMP1);
-                       a = dseg_adddouble (iptr->val.d);
-                       M_DLD(d, REG_PV, a);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                       disp = dseg_adddouble(cd, iptr->val.d);
+                       M_DLD(d, REG_PV, disp);
                        store_reg_to_var_flt (iptr->dst, d);
                        break;
 
                case ICMD_ACONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.a = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
-                       if (iptr->val.a) {
-                               a = dseg_addaddress (iptr->val.a);
-                               M_ALD(d, REG_PV, a);
-                               }
-                       else {
-                               M_INTMOVE(REG_ZERO, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
 
+                       if ((iptr->target != NULL) && (iptr->val.a == NULL)) {
+                               disp = dseg_addaddress(cd, iptr->val.a);
 
-               /* load/store operations **********************************************/
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_aconst,
+                                                                       (unresolved_class *) iptr->target, disp);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+
+                               M_ALD(d, REG_PV, disp);
+
+                       } else {
+                               if (iptr->val.a == NULL) {
+                                       M_INTMOVE(REG_ZERO, d);
+                               } else {
+                                       disp = dseg_addaddress(cd, iptr->val.a);
+                                       M_ALD(d, REG_PV, disp);
+                               }
+                       }
+                       store_reg_to_var_int(iptr->dst, d);
+                       break;
+
+
+               /* load/store operations **********************************************/
 
                case ICMD_ILOAD:      /* ...  ==> ..., content of local variable      */
                case ICMD_LLOAD:      /* op1 = local variable                         */
                case ICMD_ALOAD:
 
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if ((iptr->dst->varkind == LOCALVAR) &&
                            (iptr->dst->varnum == iptr->op1))
                                break;
-                       var = &(locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
-                       if (var->flags & INMEMORY)
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+                       if (var->flags & INMEMORY) {
                                M_LLD(d, REG_SP, 8 * var->regoff);
-                       else
-                               {M_INTMOVE(var->regoff,d);}
+                       } else {
+                               M_INTMOVE(var->regoff,d);
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
                case ICMD_FLOAD:      /* ...  ==> ..., content of local variable      */
                case ICMD_DLOAD:      /* op1 = local variable                         */
 
-                       d = reg_of_var(iptr->dst, REG_FTMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if ((iptr->dst->varkind == LOCALVAR) &&
                            (iptr->dst->varnum == iptr->op1))
                                break;
-                       var = &(locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
                        {
                                int t2 = ((iptr->opc == ICMD_FLOAD) ? TYPE_FLT : TYPE_DBL);
-                               if (var->flags & INMEMORY)
-                                       {M_CCFLD(var->type,t2,d, REG_SP, 8 * var->regoff);}
-                               else
-                                       {M_CCFLTMOVE(var->type,t2,var->regoff,d);}
+                               if (var->flags & INMEMORY) {
+                                       M_CCFLD(var->type, t2, d, REG_SP, 8 * var->regoff);
+                               } else {
+                                       M_CCFLTMOVE(var->type, t2, var->regoff, d);
+                               }
                        }
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -863,15 +610,15 @@ void codegen()
                        if ((src->varkind == LOCALVAR) &&
                            (src->varnum == iptr->op1))
                                break;
-                       var = &(locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
                        if (var->flags & INMEMORY) {
                                var_to_reg_int(s1, src, REG_ITMP1);
                                M_LST(s1, REG_SP, 8 * var->regoff);
-                               }
-                       else {
+
+                       else {
                                var_to_reg_int(s1, src, var->regoff);
                                M_INTMOVE(s1, var->regoff);
-                               }
+                       }
                        break;
 
                case ICMD_FSTORE:     /* ..., value  ==> ...                          */
@@ -880,17 +627,17 @@ void codegen()
                        if ((src->varkind == LOCALVAR) &&
                            (src->varnum == iptr->op1))
                                break;
-                       var = &(locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
                        {
                                int t1 = ((iptr->opc == ICMD_FSTORE) ? TYPE_FLT : TYPE_DBL);
                                if (var->flags & INMEMORY) {
                                        var_to_reg_flt(s1, src, REG_FTMP1);
-                                       M_CCFST(t1,var->type,s1, REG_SP, 8 * var->regoff);
-                                       }
-                               else {
+                                       M_CCFST(t1, var->type, s1, REG_SP, 8 * var->regoff);
+
+                               else {
                                        var_to_reg_flt(s1, src, var->regoff);
-                                       M_CCFLTMOVE(t1,var->type,s1, var->regoff);
-                                       }
+                                       M_CCFLTMOVE(t1, var->type, s1, var->regoff);
+                               }
                        }
                        break;
 
@@ -903,29 +650,24 @@ void codegen()
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
 
-#define M_COPY(from,to) \
-                       d = reg_of_var(to, REG_IFTMP); \
-                       if ((from->regoff != to->regoff) || \
-                           ((from->flags ^ to->flags) & INMEMORY)) { \
-                               if (IS_FLT_DBL_TYPE(from->type)) { \
-                                       var_to_reg_flt(s1, from, d); \
-                                       M_TFLTMOVE(from->type,s1,d); \
-                                       store_reg_to_var_flt(to, d); \
-                                       }\
-                               else { \
-                                       var_to_reg_int(s1, from, d); \
-                                       M_INTMOVE(s1,d); \
-                                       store_reg_to_var_int(to, d); \
-                                       }\
-                               }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
                        M_COPY(src, iptr->dst);
                        break;
 
                case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
 
-                       M_COPY(src,       iptr->dst->prev->prev);
+                       M_COPY(src,       iptr->dst);
+                       M_COPY(src->prev, iptr->dst->prev);
+                       M_COPY(iptr->dst, iptr->dst->prev->prev);
+                       break;
+
+               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
+
+                       M_COPY(src,             iptr->dst);
+                       M_COPY(src->prev,       iptr->dst->prev);
+                       M_COPY(src->prev->prev, iptr->dst->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
 
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
 
@@ -935,14 +677,11 @@ void codegen()
 
                case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
 
-                       M_COPY(src->prev,       iptr->dst->prev->prev->prev);
-
-               case ICMD_DUP_X2:     /* ..., a, b, c ==> ..., c, a, b, c             */
-
                        M_COPY(src,             iptr->dst);
                        M_COPY(src->prev,       iptr->dst->prev);
                        M_COPY(src->prev->prev, iptr->dst->prev->prev);
-                       M_COPY(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
                        break;
 
                case ICMD_DUP2_X2:    /* ..., a, b, c, d ==> ..., c, d, a, b, c, d    */
@@ -951,13 +690,13 @@ void codegen()
                        M_COPY(src->prev,             iptr->dst->prev);
                        M_COPY(src->prev->prev,       iptr->dst->prev->prev);
                        M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
-                       M_COPY(src,       iptr->dst->prev->prev->prev->prev);
-                       M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+                       M_COPY(iptr->dst,             iptr->dst->prev->prev->prev->prev);
+                       M_COPY(iptr->dst->prev,       iptr->dst->prev->prev->prev->prev->prev);
                        break;
 
                case ICMD_SWAP:       /* ..., a, b ==> ..., b, a                      */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 
@@ -967,7 +706,7 @@ void codegen()
                case ICMD_INEG:       /* ..., value  ==> ..., - value                 */
 
                        var_to_reg_int(s1, src, REG_ITMP1); 
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISUB(REG_ZERO, s1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -975,7 +714,7 @@ void codegen()
                case ICMD_LNEG:       /* ..., value  ==> ..., - value                 */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSUB(REG_ZERO, s1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -983,7 +722,7 @@ void codegen()
                case ICMD_I2L:        /* ..., value  ==> ..., value                   */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_INTMOVE(s1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -991,7 +730,7 @@ void codegen()
                case ICMD_L2I:        /* ..., value  ==> ..., value                   */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISLL_IMM(s1, 0, d );
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -999,7 +738,7 @@ void codegen()
                case ICMD_INT2BYTE:   /* ..., value  ==> ..., value                   */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSLL_IMM(s1, 56, d);
                        M_LSRA_IMM( d, 56, d);
                        store_reg_to_var_int(iptr->dst, d);
@@ -1008,7 +747,7 @@ void codegen()
                case ICMD_INT2CHAR:   /* ..., value  ==> ..., value                   */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
             M_CZEXT(s1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1016,7 +755,7 @@ void codegen()
                case ICMD_INT2SHORT:  /* ..., value  ==> ..., value                   */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSLL_IMM(s1, 48, d);
                        M_LSRA_IMM( d, 48, d);
                        store_reg_to_var_int(iptr->dst, d);
@@ -1027,7 +766,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_IADD(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1036,14 +775,13 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
                                M_IADD_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_IADD(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1051,7 +789,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LADD(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1060,14 +798,13 @@ void codegen()
                                      /* val.l = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
                                M_LADD_IMM(s1, iptr->val.l, d);
-                               }
-                       else {
+                       } else {
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_LADD(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1075,7 +812,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISUB(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1084,14 +821,13 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= -32767) && (iptr->val.i <= 32768)) {
                                M_IADD_IMM(s1, -iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_ISUB(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1099,7 +835,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSUB(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1108,14 +844,13 @@ void codegen()
                                      /* val.l = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.l >= -32767) && (iptr->val.l <= 32768)) {
                                M_LADD_IMM(s1, -iptr->val.l, d);
-                               }
-                       else {
+                       } else {
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_LSUB(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1123,7 +858,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_IMUL(s1, s2);
                        M_MFLO(d);
                        M_NOP;
@@ -1135,7 +870,7 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        ICONST(REG_ITMP2, iptr->val.i);
                        M_IMUL(s1, REG_ITMP2);
                        M_MFLO(d);
@@ -1148,7 +883,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LMUL(s1, s2);
                        M_MFLO(d);
                        M_NOP;
@@ -1160,7 +895,7 @@ void codegen()
                                      /* val.l = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        LCONST(REG_ITMP2, iptr->val.l);
                        M_LMUL(s1, REG_ITMP2);
                        M_MFLO(d);
@@ -1173,107 +908,59 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                       gen_div_check(s2);
                        M_IDIV(s1, s2);
                        M_MFLO(d);
                        M_NOP;
                        M_NOP;
                        store_reg_to_var_int(iptr->dst, d);
                        break;
-#if 0
-               case ICMD_IDIVCONST:  /* ..., value  ==> ..., value / constant        */
-                                     /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       ICONST(REG_ITMP2, iptr->val.i);
-                       M_IDIV(s1, REG_ITMP2);
-                       M_MFLO(d);
-                       M_NOP;
-                       M_NOP;
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
-#endif
                case ICMD_LDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                       gen_div_check(s2);
                        M_LDIV(s1, s2);
                        M_MFLO(d);
                        M_NOP;
                        M_NOP;
                        store_reg_to_var_int(iptr->dst, d);
                        break;
-#if 0
-               case ICMD_LDIVCONST:  /* ..., value  ==> ..., value / constant        */
-                                     /* val.l = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       LCONST(REG_ITMP2, iptr->val.l);
-                       M_LDIV(s1, REG_ITMP2);
-                       M_MFLO(d);
-                       M_NOP;
-                       M_NOP;
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
-#endif
                case ICMD_IREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                       gen_div_check(s2);
                        M_IDIV(s1, s2);
                        M_MFHI(d);
                        M_NOP;
                        M_NOP;
                        store_reg_to_var_int(iptr->dst, d);
                        break;
-#if 0
-               case ICMD_IREMCONST:  /* ..., value  ==> ..., value % constant        */
-                                     /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       ICONST(REG_ITMP2, iptr->val.i);
-                       M_IDIV(s1, REG_ITMP2);
-                       M_MFHI(d);
-                       M_NOP;
-                       M_NOP;
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
-#endif
                case ICMD_LREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                       gen_div_check(s2);
                        M_LDIV(s1, s2);
                        M_MFHI(d);
                        M_NOP;
                        M_NOP;
                        store_reg_to_var_int(iptr->dst, d);
                        break;
-#if 0
-               case ICMD_LREMCONST:  /* ..., value  ==> ..., value % constant        */
-                                     /* val.l = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       LCONST(REG_ITMP2, iptr->val.l);
-                       M_LDIV(s1, REG_ITMP2);
-                       M_MFHI(d);
-                       M_NOP;
-                       M_NOP;
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
-#endif
                case ICMD_IDIVPOW2:   /* ..., value  ==> ..., value << constant       */
                case ICMD_LDIVPOW2:   /* val.i = constant                             */
                                      
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSRA_IMM(s1, 63, REG_ITMP2);
                        M_LSRL_IMM(REG_ITMP2, 64 - iptr->val.i, REG_ITMP2);
                        M_LADD(s1, REG_ITMP2, REG_ITMP2);
@@ -1285,7 +972,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISLL(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1294,7 +981,7 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISLL_IMM(s1, iptr->val.i, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1303,7 +990,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISRA(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1312,7 +999,7 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISRA_IMM(s1, iptr->val.i, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1321,7 +1008,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISRL(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1330,7 +1017,7 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_ISRL_IMM(s1, iptr->val.i, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1339,7 +1026,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSLL(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1348,7 +1035,7 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSLL_IMM(s1, iptr->val.i, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1357,7 +1044,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSRA(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1366,7 +1053,7 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSRA_IMM(s1, iptr->val.i, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1375,7 +1062,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSRL(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1384,7 +1071,7 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_LSRL_IMM(s1, iptr->val.i, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1394,7 +1081,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_AND(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1403,14 +1090,13 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
                                M_AND_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_AND(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1418,72 +1104,40 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (s1 == d) {
                                M_MOV(s1, REG_ITMP1);
                                s1 = REG_ITMP1;
-                               }
+                       }
                        if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
                                M_AND_IMM(s1, iptr->val.i, d);
                                M_BGEZ(s1, 4);
                                M_NOP;
                                M_ISUB(REG_ZERO, s1, d);
                                M_AND_IMM(d, iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_AND(s1, REG_ITMP2, d);
                                M_BGEZ(s1, 4);
                                M_NOP;
                                M_ISUB(REG_ZERO, s1, d);
                                M_AND(d, REG_ITMP2, d);
-                               }
+                       }
                        M_ISUB(REG_ZERO, d, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_IREM0X10001:  /* ..., value  ==> ..., value % 0x100001      */
-               
-/*          b = value & 0xffff;
-                       a = value >> 16;
-                       a = ((b - a) & 0xffff) + (b < a);
-*/
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       if (s1 == d) {
-                               M_MOV(s1, REG_ITMP3);
-                               s1 = REG_ITMP3;
-                               }
-                       M_BLTZ(s1, 7);
-            M_CZEXT(s1, REG_ITMP2);                             /* delay slot */
-                       M_ISRA_IMM(s1, 16, d);
-                       M_CMPLT(REG_ITMP2, d, REG_ITMP1);
-                       M_ISUB(REG_ITMP2, d, d);
-            M_CZEXT(d, d);
-                       M_BR(7);
-                       M_IADD(d, REG_ITMP1, d);                            /* delay slot */
-
-                       M_LUI(REG_ITMP2, 1);
-                       M_IADD_IMM(REG_ITMP2, 1, REG_ITMP2);
-                       M_IDIV(s1, REG_ITMP2);
-                       M_MFHI(d);
-                       M_NOP;
-                       M_NOP;
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
-
                case ICMD_LANDCONST:  /* ..., value  ==> ..., value & constant        */
                                      /* val.l = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
                                M_AND_IMM(s1, iptr->val.l, d);
-                               }
-                       else {
+                       } else {
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_AND(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1491,50 +1145,36 @@ void codegen()
                                      /* val.l = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (s1 == d) {
                                M_MOV(s1, REG_ITMP1);
                                s1 = REG_ITMP1;
-                               }
+                       }
                        if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
                                M_AND_IMM(s1, iptr->val.l, d);
                                M_BGEZ(s1, 4);
                                M_NOP;
                                M_LSUB(REG_ZERO, s1, d);
                                M_AND_IMM(d, iptr->val.l, d);
-                               }
-                       else {
+                       } else {
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_AND(s1, REG_ITMP2, d);
                                M_BGEZ(s1, 4);
                                M_NOP;
                                M_LSUB(REG_ZERO, s1, d);
                                M_AND(d, REG_ITMP2, d);
-                               }
+                       }
                        M_LSUB(REG_ZERO, d, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_LREM0X10001:/* ..., value  ==> ..., value % 0x10001         */
-
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       M_LUI(REG_ITMP2, 1);
-                       M_LADD_IMM(REG_ITMP2, 1, REG_ITMP2);
-                       M_LDIV(s1, REG_ITMP2);
-                       M_MFHI(d);
-                       M_NOP;
-                       M_NOP;
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
-
                case ICMD_IOR:        /* ..., val1, val2  ==> ..., val1 | val2        */
                case ICMD_LOR:
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       M_OR( s1,s2, d);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                       M_OR(s1,s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1542,14 +1182,13 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
                                M_OR_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_OR(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1557,14 +1196,13 @@ void codegen()
                                      /* val.l = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
                                M_OR_IMM(s1, iptr->val.l, d);
-                               }
-                       else {
+                       } else {
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_OR(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1573,7 +1211,7 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_XOR(s1, s2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
@@ -1582,14 +1220,13 @@ void codegen()
                                      /* val.i = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
                                M_XOR_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_XOR(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1597,14 +1234,13 @@ void codegen()
                                      /* val.l = constant                             */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
                                M_XOR_IMM(s1, iptr->val.l, d);
-                               }
-                       else {
+                       } else {
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_XOR(s1, REG_ITMP2, d);
-                               }
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1613,10 +1249,10 @@ void codegen()
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_CMPLT(s1, s2, REG_ITMP3);
                        M_CMPLT(s2, s1, REG_ITMP1);
-                       M_LSUB (REG_ITMP1, REG_ITMP3, d);
+                       M_LSUB(REG_ITMP1, REG_ITMP3, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -1624,16 +1260,15 @@ void codegen()
                case ICMD_IINC:       /* ..., value  ==> ..., value + constant        */
                                      /* op1 = variable, val.i = constant             */
 
-                       var = &(locals[iptr->op1][TYPE_INT]);
+                       var = &(rd->locals[iptr->op1][TYPE_INT]);
                        if (var->flags & INMEMORY) {
                                s1 = REG_ITMP1;
-                               M_LLD(s1, REG_SP, 8 * var->regoff);
-                               }
-                       else
+                               M_LLD(s1, REG_SP, var->regoff * 8);
+                       } else
                                s1 = var->regoff;
                        M_IADD_IMM(s1, iptr->val.i, s1);
                        if (var->flags & INMEMORY)
-                               M_LST(s1, REG_SP, 8 * var->regoff);
+                               M_LST(s1, REG_SP, var->regoff * 8);
                        break;
 
 
@@ -1642,7 +1277,7 @@ void codegen()
                case ICMD_FNEG:       /* ..., value  ==> ..., - value                 */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_FNEG(s1, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1650,7 +1285,7 @@ void codegen()
                case ICMD_DNEG:       /* ..., value  ==> ..., - value                 */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_DNEG(s1, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1659,7 +1294,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_FADD(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1668,7 +1303,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_DADD(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1677,7 +1312,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_FSUB(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1686,7 +1321,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_DSUB(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1695,16 +1330,16 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_FMUL(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
-               case ICMD_DMUL:       /* ..., val1, val2  ==> ..., val1 *** val2        */
+               case ICMD_DMUL:       /* ..., val1, val2  ==> ..., val1 *** val2      */
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_DMUL(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1713,7 +1348,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_FDIV(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1722,17 +1357,17 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_DDIV(s1, s2, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
-               
+
+#if 0          
                case ICMD_FREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
-                       panic("FREM");
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        M_FDIV(s1,s2, REG_FTMP3);
                        M_FLOORFL(REG_FTMP3, REG_FTMP3);
                        M_CVTLF(REG_FTMP3, REG_FTMP3);
@@ -1745,7 +1380,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        M_DDIV(s1,s2, REG_FTMP3);
                        M_FLOORDL(REG_FTMP3, REG_FTMP3);
                        M_CVTLD(REG_FTMP3, REG_FTMP3);
@@ -1753,11 +1388,12 @@ void codegen()
                        M_DSUB(s1, REG_FTMP3, d);
                        store_reg_to_var_flt(iptr->dst, d);
                    break;
+#endif
 
                case ICMD_I2F:       /* ..., value  ==> ..., (float) value            */
                case ICMD_L2F:
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_MOVLD(s1, d);
                        M_CVTLF(d, d);
                        store_reg_to_var_flt(iptr->dst, d);
@@ -1766,16 +1402,19 @@ void codegen()
                case ICMD_I2D:       /* ..., value  ==> ..., (double) value           */
                case ICMD_L2D:
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_MOVLD(s1, d);
                        M_CVTLD(d, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
-                       
+
+#if 0
+               /* XXX these do not work correctly */
+
                case ICMD_F2I:       /* ..., (float) value  ==> ..., (int) value      */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        M_TRUNCFI(s1, REG_FTMP1);
                        M_MOVDI(REG_FTMP1, d);
                        M_NOP;
@@ -1785,7 +1424,7 @@ void codegen()
                case ICMD_D2I:       /* ..., (double) value  ==> ..., (int) value     */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        M_TRUNCDI(s1, REG_FTMP1);
                        M_MOVDI(REG_FTMP1, d);
                        M_NOP;
@@ -1795,7 +1434,7 @@ void codegen()
                case ICMD_F2L:       /* ..., (float) value  ==> ..., (long) value     */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        M_TRUNCFL(s1, REG_FTMP1);
                        M_MOVDL(REG_FTMP1, d);
                        M_NOP;
@@ -1805,17 +1444,18 @@ void codegen()
                case ICMD_D2L:       /* ..., (double) value  ==> ..., (long) value    */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        M_TRUNCDL(s1, REG_FTMP1);
                        M_MOVDL(REG_FTMP1, d);
                        M_NOP;
                        store_reg_to_var_int(iptr->dst, d);
                        break;
+#endif
 
                case ICMD_F2D:       /* ..., value  ==> ..., (double) value           */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_CVTFD(s1, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1823,7 +1463,7 @@ void codegen()
                case ICMD_D2F:       /* ..., value  ==> ..., (double) value           */
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP2);
                        M_CVTDF(s1, d);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
@@ -1832,7 +1472,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        M_FCMPULEF(s1, s2);
                        M_FBT(3);
                        M_LADD_IMM(REG_ZERO, 1, d);
@@ -1848,7 +1488,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        M_FCMPULED(s1, s2);
                        M_FBT(3);
                        M_LADD_IMM(REG_ZERO, 1, d);
@@ -1864,7 +1504,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        M_FCMPOLTF(s1, s2);
                        M_FBF(3);
                        M_LSUB_IMM(REG_ZERO, 1, d);
@@ -1880,7 +1520,7 @@ void codegen()
 
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        M_FCMPOLTD(s1, s2);
                        M_FBF(3);
                        M_LSUB_IMM(REG_ZERO, 1, d);
@@ -1895,170 +1535,175 @@ void codegen()
 
                /* memory operations **************************************************/
 
-#define gen_bound_check \
-    if (checkbounds) { \
-        M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size)); \
-        M_CMPULT(s2, REG_ITMP3, REG_ITMP3); \
-        M_BEQZ(REG_ITMP3, 0); \
-        codegen_addxboundrefs(mcodeptr, s2); \
-        M_NOP; \
-    }
-
                case ICMD_ARRAYLENGTH: /* ..., arrayref  ==> ..., length              */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        gen_nullptr_check(s1);
                        M_ILD(d, s1, OFFSET(java_arrayheader, size));
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_AALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_BALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
-                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_ALD(d, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+                       }
+                       M_AADD(s2, s1, REG_ITMP3);
+                       M_BLDS(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_IALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_CALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_ASLL_IMM(s2, 2, REG_ITMP2);
-                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_ILD(d, REG_ITMP1, OFFSET(java_intarray, data[0]));
+                       }
+                       M_AADD(s2, s1, REG_ITMP3);
+                       M_AADD(s2, REG_ITMP3, REG_ITMP3);
+                       M_SLDU(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
                        store_reg_to_var_int(iptr->dst, d);
-                       break;
+                       break;                  
 
-               case ICMD_LALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_SALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_ASLL_IMM(s2, 3, REG_ITMP2);
-                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_LLD(d, REG_ITMP1, OFFSET(java_longarray, data[0]));
+                       }
+                       M_AADD(s2, s1, REG_ITMP3);
+                       M_AADD(s2, REG_ITMP3, REG_ITMP3);
+                       M_SLDS(d, REG_ITMP3, OFFSET(java_chararray, data[0]));
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_FALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_IALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_ASLL_IMM(s2, 2, REG_ITMP2);
-                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_FLD(d, REG_ITMP1, OFFSET(java_floatarray, data[0]));
-                       store_reg_to_var_flt(iptr->dst, d);
+                       }
+                       M_ASLL_IMM(s2, 2, REG_ITMP3);
+                       M_AADD(REG_ITMP3, s1, REG_ITMP3);
+                       M_ILD(d, REG_ITMP3, OFFSET(java_intarray, data[0]));
+                       store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_DALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_LALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_ASLL_IMM(s2, 3, REG_ITMP2);
-                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_DLD(d, REG_ITMP1, OFFSET(java_doublearray, data[0]));
-                       store_reg_to_var_flt(iptr->dst, d);
+                       }
+                       M_ASLL_IMM(s2, 3, REG_ITMP3);
+                       M_AADD(REG_ITMP3, s1, REG_ITMP3);
+                       M_LLD(d, REG_ITMP3, OFFSET(java_longarray, data[0]));
+                       store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_CALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_FALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_AADD(s2, s1, REG_ITMP1);
-                       M_AADD(s2, REG_ITMP1, REG_ITMP1);
-                       M_SLDU(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;                  
+                       }
+                       M_ASLL_IMM(s2, 2, REG_ITMP3);
+                       M_AADD(REG_ITMP3, s1, REG_ITMP3);
+                       M_FLD(d, REG_ITMP3, OFFSET(java_floatarray, data[0]));
+                       store_reg_to_var_flt(iptr->dst, d);
+                       break;
 
-               case ICMD_SALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_DALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_AADD(s2, s1, REG_ITMP1);
-                       M_AADD(s2, REG_ITMP1, REG_ITMP1);
-                       M_SLDS(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
-                       store_reg_to_var_int(iptr->dst, d);
+                       }
+                       M_ASLL_IMM(s2, 3, REG_ITMP3);
+                       M_AADD(REG_ITMP3, s1, REG_ITMP3);
+                       M_DLD(d, REG_ITMP3, OFFSET(java_doublearray, data[0]));
+                       store_reg_to_var_flt(iptr->dst, d);
                        break;
 
-               case ICMD_BALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_AALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_AADD(s2, s1, REG_ITMP1);
-                       M_BLDS(d, REG_ITMP1, OFFSET(java_chararray, data[0]));
+                       }
+                       M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP3);
+                       M_AADD(REG_ITMP3, s1, REG_ITMP3);
+                       M_ALD(d, REG_ITMP3, OFFSET(java_objectarray, data[0]));
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
 
-               case ICMD_AASTORE:    /* ..., arrayref, index, value  ==> ...         */
+               case ICMD_BASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
+                       }
+                       M_AADD(s2, s1, REG_ITMP1);
                        var_to_reg_int(s3, src, REG_ITMP3);
-                       M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
-                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_AST(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+                       M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
                        break;
 
-               case ICMD_IASTORE:    /* ..., arrayref, index, value  ==> ...         */
+               case ICMD_CASTORE:    /* ..., arrayref, index, value  ==> ...         */
+               case ICMD_SASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_int(s3, src, REG_ITMP3);
+                       }
+                       M_AADD(s2, s1, REG_ITMP1);
+                       M_AADD(s2, REG_ITMP1, REG_ITMP1);
+                       var_to_reg_int(s3, src, REG_ITMP3);
+                       M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
+                       break;
+
+               case ICMD_IASTORE:    /* ..., arrayref, index, value  ==> ...         */
+
+                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
+                       var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
                        M_ASLL_IMM(s2, 2, REG_ITMP2);
                        M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_IST(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
+                       var_to_reg_int(s3, src, REG_ITMP3);
+                       M_IST_INTERN(s3, REG_ITMP1, OFFSET(java_intarray, data[0]));
                        break;
 
                case ICMD_LASTORE:    /* ..., arrayref, index, value  ==> ...         */
@@ -2068,11 +1713,11 @@ void codegen()
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_int(s3, src, REG_ITMP3);
+                       }
                        M_ASLL_IMM(s2, 3, REG_ITMP2);
                        M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_LST(s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
+                       var_to_reg_int(s3, src, REG_ITMP3);
+                       M_LST_INTERN(s3, REG_ITMP1, OFFSET(java_longarray, data[0]));
                        break;
 
                case ICMD_FASTORE:    /* ..., arrayref, index, value  ==> ...         */
@@ -2082,11 +1727,11 @@ void codegen()
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_flt(s3, src, REG_FTMP3);
+                       }
                        M_ASLL_IMM(s2, 2, REG_ITMP2);
                        M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_FST(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
+                       var_to_reg_flt(s3, src, REG_FTMP1);
+                       M_FST_INTERN(s3, REG_ITMP1, OFFSET(java_floatarray, data[0]));
                        break;
 
                case ICMD_DASTORE:    /* ..., arrayref, index, value  ==> ...         */
@@ -2096,256 +1741,435 @@ void codegen()
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_flt(s3, src, REG_FTMP3);
+                       }
                        M_ASLL_IMM(s2, 3, REG_ITMP2);
                        M_AADD(REG_ITMP2, s1, REG_ITMP1);
-                       M_DST(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
+                       var_to_reg_flt(s3, src, REG_FTMP1);
+                       M_DST_INTERN(s3, REG_ITMP1, OFFSET(java_doublearray, data[0]));
                        break;
 
-               case ICMD_CASTORE:    /* ..., arrayref, index, value  ==> ...         */
-               case ICMD_SASTORE:    /* ..., arrayref, index, value  ==> ...         */
+
+               case ICMD_AASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
+                       }
                        var_to_reg_int(s3, src, REG_ITMP3);
-                       M_AADD(s2, s1, REG_ITMP1);
-                       M_AADD(s2, REG_ITMP1, REG_ITMP1);
-                       M_SST(s3, REG_ITMP1, OFFSET(java_chararray, data[0]));
-                       break;
 
-               case ICMD_BASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       M_MOV(s1, rd->argintregs[0]);
+                       M_MOV(s3, rd->argintregs[1]);
+                       disp = dseg_addaddress(cd, BUILTIN_canstore);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_JSR(REG_RA, REG_ITMP3);
+                       M_NOP;
+
+                       M_BEQZ(REG_RESULT, 0);
+                       codegen_add_arraystoreexception_ref(cd, mcodeptr);
+                       M_NOP;
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
+                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
+                       var_to_reg_int(s3, src, REG_ITMP3);
+                       M_AST_INTERN(s3, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+                       break;
+
+
+               case ICMD_BASTORECONST:   /* ..., arrayref, index  ==> ...            */
+
+                       var_to_reg_int(s1, src->prev, REG_ITMP1);
+                       var_to_reg_int(s2, src, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_int(s3, src, REG_ITMP3);
+                       }
                        M_AADD(s2, s1, REG_ITMP1);
-                       M_BST(s3, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+                       M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+                       break;
+
+               case ICMD_CASTORECONST:   /* ..., arrayref, index  ==> ...            */
+               case ICMD_SASTORECONST:   /* ..., arrayref, index  ==> ...            */
+
+                       var_to_reg_int(s1, src->prev, REG_ITMP1);
+                       var_to_reg_int(s2, src, REG_ITMP2);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
+                       M_AADD(s2, s1, REG_ITMP1);
+                       M_AADD(s2, REG_ITMP1, REG_ITMP1);
+                       M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray, data[0]));
                        break;
 
+               case ICMD_IASTORECONST:   /* ..., arrayref, index  ==> ...            */
+
+                       var_to_reg_int(s1, src->prev, REG_ITMP1);
+                       var_to_reg_int(s2, src, REG_ITMP2);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
+                       M_ASLL_IMM(s2, 2, REG_ITMP2);
+                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
+                       M_IST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_intarray, data[0]));
+                       break;
+
+               case ICMD_LASTORECONST:   /* ..., arrayref, index  ==> ...            */
+
+                       var_to_reg_int(s1, src->prev, REG_ITMP1);
+                       var_to_reg_int(s2, src, REG_ITMP2);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
+                       M_ASLL_IMM(s2, 3, REG_ITMP2);
+                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
+                       M_LST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_longarray, data[0]));
+                       break;
+
+               case ICMD_AASTORECONST:   /* ..., arrayref, index  ==> ...            */
+
+                       var_to_reg_int(s1, src->prev, REG_ITMP1);
+                       var_to_reg_int(s2, src, REG_ITMP2);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
+                       M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
+                       M_AADD(REG_ITMP2, s1, REG_ITMP1);
+                       M_AST_INTERN(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+                       break;
+
+
+               case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
+                                     /* op1 = type, val.a = field address            */
+
+                       if (iptr->val.a == NULL) {
+                               disp = dseg_addaddress(cd, NULL);
+
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_get_putstatic,
+                                                                       (unresolved_field *) iptr->target, disp);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+
+                       } else {
+                               fieldinfo *fi = iptr->val.a;
+
+                               disp = dseg_addaddress(cd, &(fi->value));
+
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_clinit, fi->class, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
+                                       }
+                               }
+                       }
+
+                       M_ALD(REG_ITMP1, REG_PV, disp);
+                       switch (iptr->op1) {
+                       case TYPE_INT:
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               M_ILD_INTERN(d, REG_ITMP1, 0);
+                               store_reg_to_var_int(iptr->dst, d);
+                               break;
+                       case TYPE_LNG:
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               M_LLD_INTERN(d, REG_ITMP1, 0);
+                               store_reg_to_var_int(iptr->dst, d);
+                               break;
+                       case TYPE_ADR:
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               M_ALD_INTERN(d, REG_ITMP1, 0);
+                               store_reg_to_var_int(iptr->dst, d);
+                               break;
+                       case TYPE_FLT:
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               M_FLD_INTERN(d, REG_ITMP1, 0);
+                               store_reg_to_var_flt(iptr->dst, d);
+                               break;
+                       case TYPE_DBL:                          
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               M_DLD_INTERN(d, REG_ITMP1, 0);
+                               store_reg_to_var_flt(iptr->dst, d);
+                               break;
+                       }
+                       break;
 
                case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
                                      /* op1 = type, val.a = field address            */
 
-                       /* if class isn't yet initialized, do it */
-                       if (!((fieldinfo *) iptr->val.a)->class->initialized) {
-                               /* call helper function which patches this code */
-                               a = dseg_addaddress(((fieldinfo *) iptr->val.a)->class);
-                               M_ALD(REG_ITMP1, REG_PV, a);
-                               a = dseg_addaddress(asm_check_clinit);
-                               M_ALD(REG_ITMP3, REG_PV, a);
-                               M_JSR(REG_RA, REG_ITMP3);
-                               M_NOP;
+                       if (iptr->val.a == NULL) {
+                               disp = dseg_addaddress(cd, NULL);
 
-#if 0
-                               s1 = (s4) ((u1 *) mcodeptr - mcodebase);
-                               if (s1 <= 32768) {
-                                       M_LDA(REG_PV, REG_RA, -s1);
-                                       M_NOP;
-                                       M_NOP;
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_get_putstatic,
+                                                                       (unresolved_field *) iptr->target, disp);
 
-                               } else {
-                                       s4 ml = -s1, mh = 0;
-                                       while (ml < -32768) { ml += 65536; mh--; }
-                                       M_LUI(REG_PV, mh);
-                                       M_IADD_IMM(REG_PV, ml, REG_PV);
-                                       M_LADD(REG_PV, REG_RA, REG_PV);
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+
+                       } else {
+                               fieldinfo *fi = iptr->val.a;
+
+                               disp = dseg_addaddress(cd, &(fi->value));
+
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_clinit, fi->class, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
+                                       }
                                }
-#endif
                        }
 
-                       a = dseg_addaddress(&(((fieldinfo *) iptr->val.a)->value));
-                       M_ALD(REG_ITMP1, REG_PV, a);
+                       M_ALD(REG_ITMP1, REG_PV, disp);
                        switch (iptr->op1) {
                        case TYPE_INT:
                                var_to_reg_int(s2, src, REG_ITMP2);
-                               M_IST(s2, REG_ITMP1, 0);
+                               M_IST_INTERN(s2, REG_ITMP1, 0);
                                break;
                        case TYPE_LNG:
                                var_to_reg_int(s2, src, REG_ITMP2);
-                               M_LST(s2, REG_ITMP1, 0);
+                               M_LST_INTERN(s2, REG_ITMP1, 0);
                                break;
                        case TYPE_ADR:
                                var_to_reg_int(s2, src, REG_ITMP2);
-                               M_AST(s2, REG_ITMP1, 0);
+                               M_AST_INTERN(s2, REG_ITMP1, 0);
                                break;
                        case TYPE_FLT:
                                var_to_reg_flt(s2, src, REG_FTMP2);
-                               M_FST(s2, REG_ITMP1, 0);
+                               M_FST_INTERN(s2, REG_ITMP1, 0);
                                break;
                        case TYPE_DBL:
                                var_to_reg_flt(s2, src, REG_FTMP2);
-                               M_DST(s2, REG_ITMP1, 0);
+                               M_DST_INTERN(s2, REG_ITMP1, 0);
                                break;
-                       default: panic ("internal error");
                        }
                        break;
 
-               case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
-                                     /* op1 = type, val.a = field address            */
+               case ICMD_PUTSTATICCONST: /* ...  ==> ...                             */
+                                         /* val = value (in current instruction)     */
+                                         /* op1 = type, val.a = field address (in    */
+                                         /* following NOP)                           */
 
-                       /* if class isn't yet initialized, do it */
-                       if (!((fieldinfo *) iptr->val.a)->class->initialized) {
-                               /* call helper function which patches this code */
-                               a = dseg_addaddress(((fieldinfo *) iptr->val.a)->class);
-                               M_ALD(REG_ITMP1, REG_PV, a);
-                               a = dseg_addaddress(asm_check_clinit);
-                               M_ALD(REG_ITMP3, REG_PV, a);
-                               M_JSR(REG_RA, REG_ITMP3);
-                               M_NOP;
+                       if (iptr[1].val.a == NULL) {
+                               disp = dseg_addaddress(cd, NULL);
 
-#if 0
-                               s1 = (s4) ((u1 *) mcodeptr - mcodebase);
-                               if (s1 <= 32768) {
-                                       M_LDA(REG_PV, REG_RA, -s1);
-                                       M_NOP;
-                                       M_NOP;
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_get_putstatic,
+                                                                       (unresolved_field *) iptr[1].target, disp);
 
-                               } else {
-                                       s4 ml = -s1, mh = 0;
-                                       while (ml < -32768) { ml += 65536; mh--; }
-                                       M_LUI(REG_PV, mh);
-                                       M_IADD_IMM(REG_PV, ml, REG_PV);
-                                       M_LADD(REG_PV, REG_RA, REG_PV);
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+
+                       } else {
+                               fieldinfo *fi = iptr[1].val.a;
+
+                               disp = dseg_addaddress(cd, &(fi->value));
+
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_clinit, fi->class, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
+                                       }
                                }
-#endif
                        }
 
-                       a = dseg_addaddress(&(((fieldinfo *) iptr->val.a)->value));
-                       M_ALD(REG_ITMP1, REG_PV, a);
+                       M_ALD(REG_ITMP1, REG_PV, disp);
+                       switch (iptr->op1) {
+                       case TYPE_INT:
+                               M_IST_INTERN(REG_ZERO, REG_ITMP1, 0);
+                               break;
+                       case TYPE_LNG:
+                               M_LST_INTERN(REG_ZERO, REG_ITMP1, 0);
+                               break;
+                       case TYPE_ADR:
+                               M_AST_INTERN(REG_ZERO, REG_ITMP1, 0);
+                               break;
+                       case TYPE_FLT:
+                               M_FST_INTERN(REG_ZERO, REG_ITMP1, 0);
+                               break;
+                       case TYPE_DBL:
+                               M_DST_INTERN(REG_ZERO, REG_ITMP1, 0);
+                               break;
+                       }
+                       break;
+
+
+               case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
+                                     /* op1 = type, val.i = field offset             */
+
+                       var_to_reg_int(s1, src, REG_ITMP1);
+                       gen_nullptr_check(s1);
+
+                       if (iptr->val.a == NULL) {
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_get_putfield,
+                                                                       (unresolved_field *) iptr->target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+
+                               a = 0;
+
+                       } else {
+                               a = ((fieldinfo *) (iptr->val.a))->offset;
+                       }
+
                        switch (iptr->op1) {
                        case TYPE_INT:
-                               d = reg_of_var(iptr->dst, REG_ITMP3);
-                               M_ILD(d, REG_ITMP1, 0);
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               M_ILD(d, s1, a);
                                store_reg_to_var_int(iptr->dst, d);
                                break;
                        case TYPE_LNG:
-                               d = reg_of_var(iptr->dst, REG_ITMP3);
-                               M_LLD(d, REG_ITMP1, 0);
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               M_LLD(d, s1, a);
                                store_reg_to_var_int(iptr->dst, d);
                                break;
                        case TYPE_ADR:
-                               d = reg_of_var(iptr->dst, REG_ITMP3);
-                               M_ALD(d, REG_ITMP1, 0);
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               M_ALD(d, s1, a);
                                store_reg_to_var_int(iptr->dst, d);
                                break;
                        case TYPE_FLT:
-                               d = reg_of_var(iptr->dst, REG_FTMP1);
-                               M_FLD(d, REG_ITMP1, 0);
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               M_FLD(d, s1, a);
                                store_reg_to_var_flt(iptr->dst, d);
                                break;
                        case TYPE_DBL:                          
-                               d = reg_of_var(iptr->dst, REG_FTMP1);
-                               M_DLD(d, REG_ITMP1, 0);
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               M_DLD(d, s1, a);
                                store_reg_to_var_flt(iptr->dst, d);
                                break;
-                       default: panic ("internal error");
                        }
                        break;
 
+               case ICMD_PUTFIELD:   /* ..., objectref, value  ==> ...               */
+                                     /* op1 = type, val.a = field address            */
+
+                       var_to_reg_int(s1, src->prev, REG_ITMP1);
+                       gen_nullptr_check(s1);
 
-               case ICMD_PUTFIELD:   /* ..., value  ==> ...                          */
-                                     /* op1 = type, val.i = field offset             */
+                       if (!IS_FLT_DBL_TYPE(iptr->op1)) {
+                               var_to_reg_int(s2, src, REG_ITMP2);
+                       } else {
+                               var_to_reg_flt(s2, src, REG_FTMP2);
+                       }
 
-                       a = ((fieldinfo *)(iptr->val.a))->offset;
-                       switch (iptr->op1) {
-                               case TYPE_INT:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       gen_nullptr_check(s1);
-                                       M_IST(s2, s1, a);
-                                       break;
-                               case TYPE_LNG:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       gen_nullptr_check(s1);
-                                       M_LST(s2, s1, a);
-                                       break;
-                               case TYPE_ADR:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       gen_nullptr_check(s1);
-                                       M_AST(s2, s1, a);
-                                       break;
-                               case TYPE_FLT:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_flt(s2, src, REG_FTMP2);
-                                       gen_nullptr_check(s1);
-                                       M_FST(s2, s1, a);
-                                       break;
-                               case TYPE_DBL:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_flt(s2, src, REG_FTMP2);
-                                       gen_nullptr_check(s1);
-                                       M_DST(s2, s1, a);
-                                       break;
-                               default: panic ("internal error");
+                       if (iptr->val.a == NULL) {
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_get_putfield,
+                                                                       (unresolved_field *) iptr->target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
                                }
-                       break;
 
-               case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
-                                     /* op1 = type, val.i = field offset             */
+                               a = 0;
+
+                       } else {
+                               a = ((fieldinfo *) (iptr->val.a))->offset;
+                       }
 
-                       a = ((fieldinfo *)(iptr->val.a))->offset;
                        switch (iptr->op1) {
-                               case TYPE_INT:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                                       gen_nullptr_check(s1);
-                                       M_ILD(d, s1, a);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_LNG:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                                       gen_nullptr_check(s1);
-                                       M_LLD(d, s1, a);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_ADR:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                                       gen_nullptr_check(s1);
-                                       M_ALD(d, s1, a);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_FLT:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(iptr->dst, REG_FTMP1);
-                                       gen_nullptr_check(s1);
-                                       M_FLD(d, s1, a);
-                                       store_reg_to_var_flt(iptr->dst, d);
-                                       break;
-                               case TYPE_DBL:                          
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(iptr->dst, REG_FTMP1);
-                                       gen_nullptr_check(s1);
-                                       M_DLD(d, s1, a);
-                                       store_reg_to_var_flt(iptr->dst, d);
-                                       break;
-                               default: panic ("internal error");
+                       case TYPE_INT:
+                               M_IST(s2, s1, a);
+                               break;
+                       case TYPE_LNG:
+                               M_LST(s2, s1, a);
+                               break;
+                       case TYPE_ADR:
+                               M_AST(s2, s1, a);
+                               break;
+                       case TYPE_FLT:
+                               M_FST(s2, s1, a);
+                               break;
+                       case TYPE_DBL:
+                               M_DST(s2, s1, a);
+                               break;
+                       }
+                       break;
+
+               case ICMD_PUTFIELDCONST:  /* ..., objectref  ==> ...                  */
+                                         /* val = value (in current instruction)     */
+                                         /* op1 = type, val.a = field address (in    */
+                                         /* following NOP)                           */
+
+                       var_to_reg_int(s1, src, REG_ITMP1);
+                       gen_nullptr_check(s1);
+
+                       if (iptr[1].val.a == NULL) {
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_get_putfield,
+                                                                       (unresolved_field *) iptr[1].target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
                                }
+
+                               a = 0;
+
+                       } else {
+                               a = ((fieldinfo *) (iptr[1].val.a))->offset;
+                       }
+
+                       switch (iptr[1].op1) {
+                       case TYPE_INT:
+                               M_IST(REG_ZERO, s1, a);
+                               break;
+                       case TYPE_LNG:
+                               M_LST(REG_ZERO, s1, a);
+                               break;
+                       case TYPE_ADR:
+                               M_AST(REG_ZERO, s1, a);
+                               break;
+                       case TYPE_FLT:
+                               M_FST(REG_ZERO, s1, a);
+                               break;
+                       case TYPE_DBL:
+                               M_DST(REG_ZERO, s1, a);
+                               break;
+                       }
                        break;
 
 
                /* branch operations **************************************************/
 
-#define ALIGNCODENOP {if((int)((long)mcodeptr&7)){M_NOP;}}
-
                case ICMD_ATHROW:       /* ..., objectref ==> ... (, objectref)       */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
                        M_INTMOVE(s1, REG_ITMP1_XPTR);
-                       a = dseg_addaddress(asm_handle_exception);
-                       M_ALD(REG_ITMP2, REG_PV, a);
+                       
+#ifdef ENABLE_VERIFIER
+                       if (iptr->val.a) {
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_athrow_areturn,
+                                                                       (unresolved_class *) iptr->val.a, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+                       }
+#endif /* ENABLE_VERIFIER */
+
+                       disp = dseg_addaddress(cd, asm_handle_exception);
+                       M_ALD(REG_ITMP2, REG_PV, disp);
                        M_JSR(REG_ITMP2_XPC, REG_ITMP2);
                        M_NOP;
                        M_NOP;              /* nop ensures that XPC is less than the end */
@@ -2356,7 +2180,7 @@ void codegen()
                case ICMD_GOTO:         /* ... ==> ...                                */
                                        /* op1 = target JavaVM pc                     */
                        M_BR(0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        ALIGNCODENOP;
                        break;
@@ -2364,20 +2188,19 @@ void codegen()
                case ICMD_JSR:          /* ... ==> ...                                */
                                        /* op1 = target JavaVM pc                     */
 
-                       dseg_addtarget(BlockPtrOfPC(iptr->op1));
-                       M_ALD(REG_ITMP1, REG_PV, -dseglen);
+                       dseg_addtarget(cd, (basicblock *) iptr->target);
+                       M_ALD(REG_ITMP1, REG_PV, -(cd->dseglen));
                        M_JSR(REG_ITMP1, REG_ITMP1);        /* REG_ITMP1 = return address */
                        M_NOP;
                        break;
                        
                case ICMD_RET:          /* ... ==> ...                                */
                                        /* op1 = local variable                       */
-                       var = &(locals[iptr->op1][TYPE_ADR]);
+                       var = &(rd->locals[iptr->op1][TYPE_ADR]);
                        if (var->flags & INMEMORY) {
-                               M_ALD(REG_ITMP1, REG_SP, 8 * var->regoff);
+                               M_ALD(REG_ITMP1, REG_SP, var->regoff * 8);
                                M_RET(REG_ITMP1);
-                               }
-                       else
+                       } else
                                M_RET(var->regoff);
                        M_NOP;
                        ALIGNCODENOP;
@@ -2388,7 +2211,7 @@ void codegen()
 
                        var_to_reg_int(s1, src, REG_ITMP1);
                        M_BEQZ(s1, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2397,7 +2220,7 @@ void codegen()
 
                        var_to_reg_int(s1, src, REG_ITMP1);
                        M_BNEZ(s1, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2407,12 +2230,11 @@ void codegen()
                        var_to_reg_int(s1, src, REG_ITMP1);
                        if (iptr->val.i == 0) {
                                M_BEQZ(s1, 0);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_BEQ(s1, REG_ITMP2, 0);
-                               }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       }
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2422,18 +2244,16 @@ void codegen()
                        var_to_reg_int(s1, src, REG_ITMP1);
                        if (iptr->val.i == 0) {
                                M_BLTZ(s1, 0);
-                               }
-                       else {
+                       } else {
                                if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
                                        M_CMPLT_IMM(s1, iptr->val.i, REG_ITMP1);
-                                       }
-                               else {
+                               } else {
                                        ICONST(REG_ITMP2, iptr->val.i);
                                        M_CMPLT(s1, REG_ITMP2, REG_ITMP1);
-                                       }
-                               M_BNEZ(REG_ITMP1, 0);
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               M_BNEZ(REG_ITMP1, 0);
+                       }
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2455,7 +2275,7 @@ void codegen()
                                        M_BEQZ(REG_ITMP1, 0);
                                        }
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2470,7 +2290,7 @@ void codegen()
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_BNE(s1, REG_ITMP2, 0);
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2492,7 +2312,7 @@ void codegen()
                                        M_BNEZ(REG_ITMP1, 0);
                                        }
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2513,7 +2333,7 @@ void codegen()
                                        }
                                M_BEQZ(REG_ITMP1, 0);
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2528,7 +2348,7 @@ void codegen()
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_BEQ(s1, REG_ITMP2, 0);
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2549,7 +2369,7 @@ void codegen()
                                        }
                                M_BNEZ(REG_ITMP1, 0);
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2571,7 +2391,7 @@ void codegen()
                                        M_BEQZ(REG_ITMP1, 0);
                                        }
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2586,7 +2406,7 @@ void codegen()
                                LCONST(REG_ITMP2, iptr->val.l);
                                M_BNE(s1, REG_ITMP2, 0);
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2608,7 +2428,7 @@ void codegen()
                                        M_BNEZ(REG_ITMP1, 0);
                                        }
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2629,7 +2449,7 @@ void codegen()
                                        }
                                M_BEQZ(REG_ITMP1, 0);
                                }
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2640,7 +2460,7 @@ void codegen()
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
                        M_BEQ(s1, s2, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2651,7 +2471,7 @@ void codegen()
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
                        M_BNE(s1, s2, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2662,7 +2482,7 @@ void codegen()
                        var_to_reg_int(s2, src, REG_ITMP2);
                        M_CMPLT(s1, s2, REG_ITMP1);
                        M_BNEZ(REG_ITMP1, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2673,7 +2493,7 @@ void codegen()
                        var_to_reg_int(s2, src, REG_ITMP2);
                        M_CMPGT(s1, s2, REG_ITMP1);
                        M_BNEZ(REG_ITMP1, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2684,7 +2504,7 @@ void codegen()
                        var_to_reg_int(s2, src, REG_ITMP2);
                        M_CMPGT(s1, s2, REG_ITMP1);
                        M_BEQZ(REG_ITMP1, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2695,7 +2515,7 @@ void codegen()
                        var_to_reg_int(s2, src, REG_ITMP2);
                        M_CMPLT(s1, s2, REG_ITMP1);
                        M_BEQZ(REG_ITMP1, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target, mcodeptr);
                        M_NOP;
                        break;
 
@@ -2709,33 +2529,32 @@ void codegen()
                                        /* val.i = constant                           */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        s3 = iptr->val.i;
                        if (iptr[1].opc == ICMD_ELSE_ICONST) {
                                if ((s3 == 1) && (iptr[1].val.i == 0)) {
                                        M_CMPEQ(s1, REG_ZERO, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if ((s3 == 0) && (iptr[1].val.i == 1)) {
                                        M_CMPEQ(s1, REG_ZERO, d);
                                        M_XOR_IMM(d, 1, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if (s1 == d) {
                                        M_MOV(s1, REG_ITMP1);
                                        s1 = REG_ITMP1;
-                                       }
-                               ICONST(d, iptr[1].val.i);
                                }
+                               ICONST(d, iptr[1].val.i);
+                       }
                        if ((s3 >= 0) && (s3 <= 255)) {
                                M_CMOVEQ_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_CMOVEQ(s1, REG_ITMP2, d);
-                               }
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_CMOVEQ(s1, REG_ITMP3, d);
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -2743,33 +2562,32 @@ void codegen()
                                        /* val.i = constant                           */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        s3 = iptr->val.i;
                        if (iptr[1].opc == ICMD_ELSE_ICONST) {
                                if ((s3 == 0) && (iptr[1].val.i == 1)) {
                                        M_CMPEQ(s1, REG_ZERO, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if ((s3 == 1) && (iptr[1].val.i == 0)) {
                                        M_CMPEQ(s1, REG_ZERO, d);
                                        M_XOR_IMM(d, 1, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if (s1 == d) {
                                        M_MOV(s1, REG_ITMP1);
                                        s1 = REG_ITMP1;
-                                       }
-                               ICONST(d, iptr[1].val.i);
                                }
+                               ICONST(d, iptr[1].val.i);
+                       }
                        if ((s3 >= 0) && (s3 <= 255)) {
                                M_CMOVNE_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_CMOVNE(s1, REG_ITMP2, d);
-                               }
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_CMOVNE(s1, REG_ITMP3, d);
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -2777,32 +2595,31 @@ void codegen()
                                        /* val.i = constant                           */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        s3 = iptr->val.i;
                        if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
                                if ((s3 == 1) && (iptr[1].val.i == 0)) {
                                        M_CMPLT(s1, REG_ZERO, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if ((s3 == 0) && (iptr[1].val.i == 1)) {
                                        M_CMPLE(REG_ZERO, s1, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if (s1 == d) {
                                        M_MOV(s1, REG_ITMP1);
                                        s1 = REG_ITMP1;
-                                       }
-                               ICONST(d, iptr[1].val.i);
                                }
+                               ICONST(d, iptr[1].val.i);
+                       }
                        if ((s3 >= 0) && (s3 <= 255)) {
                                M_CMOVLT_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_CMOVLT(s1, REG_ITMP2, d);
-                               }
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_CMOVLT(s1, REG_ITMP3, d);
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -2810,32 +2627,31 @@ void codegen()
                                        /* val.i = constant                           */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        s3 = iptr->val.i;
                        if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
                                if ((s3 == 1) && (iptr[1].val.i == 0)) {
                                        M_CMPLE(REG_ZERO, s1, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if ((s3 == 0) && (iptr[1].val.i == 1)) {
                                        M_CMPLT(s1, REG_ZERO, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if (s1 == d) {
                                        M_MOV(s1, REG_ITMP1);
                                        s1 = REG_ITMP1;
-                                       }
-                               ICONST(d, iptr[1].val.i);
                                }
+                               ICONST(d, iptr[1].val.i);
+                       }
                        if ((s3 >= 0) && (s3 <= 255)) {
                                M_CMOVGE_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_CMOVGE(s1, REG_ITMP2, d);
-                               }
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_CMOVGE(s1, REG_ITMP3, d);
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -2843,32 +2659,31 @@ void codegen()
                                        /* val.i = constant                           */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        s3 = iptr->val.i;
                        if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
                                if ((s3 == 1) && (iptr[1].val.i == 0)) {
                                        M_CMPLT(REG_ZERO, s1, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if ((s3 == 0) && (iptr[1].val.i == 1)) {
                                        M_CMPLE(s1, REG_ZERO, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if (s1 == d) {
                                        M_MOV(s1, REG_ITMP1);
                                        s1 = REG_ITMP1;
-                                       }
-                               ICONST(d, iptr[1].val.i);
                                }
+                               ICONST(d, iptr[1].val.i);
+                       }
                        if ((s3 >= 0) && (s3 <= 255)) {
                                M_CMOVGT_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_CMOVGT(s1, REG_ITMP2, d);
-                               }
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_CMOVGT(s1, REG_ITMP3, d);
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
@@ -2876,32 +2691,31 @@ void codegen()
                                        /* val.i = constant                           */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        s3 = iptr->val.i;
                        if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
                                if ((s3 == 1) && (iptr[1].val.i == 0)) {
                                        M_CMPLE(s1, REG_ZERO, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if ((s3 == 0) && (iptr[1].val.i == 1)) {
                                        M_CMPLT(REG_ZERO, s1, d);
                                        store_reg_to_var_int(iptr->dst, d);
                                        break;
-                                       }
+                               }
                                if (s1 == d) {
                                        M_MOV(s1, REG_ITMP1);
                                        s1 = REG_ITMP1;
-                                       }
-                               ICONST(d, iptr[1].val.i);
                                }
+                               ICONST(d, iptr[1].val.i);
+                       }
                        if ((s3 >= 0) && (s3 <= 255)) {
                                M_CMOVLE_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_CMOVLE(s1, REG_ITMP2, d);
-                               }
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_CMOVLE(s1, REG_ITMP3, d);
+                       }
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 #endif
@@ -2909,37 +2723,31 @@ void codegen()
 
                case ICMD_IRETURN:      /* ..., retvalue ==> ...                      */
                case ICMD_LRETURN:
-               case ICMD_ARETURN:
 
-#if defined(USE_THREADS)
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               s4 disp;
-                               a = dseg_addaddress((void *) (builtin_monitorexit));
-                               M_ALD(REG_ITMP3, REG_PV, a);
-                               M_JSR(REG_RA, REG_ITMP3);
-                               M_ALD(argintregs[0], REG_SP, maxmemuse * 8);    /* delay slot */
-                               disp = -(s4) ((u1 *) mcodeptr - mcodebase);
-                               M_LDA(REG_PV, REG_RA, disp);
-                       }
-#endif
                        var_to_reg_int(s1, src, REG_RESULT);
                        M_INTMOVE(s1, REG_RESULT);
                        goto nowperformreturn;
 
-               case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
-               case ICMD_DRETURN:
+               case ICMD_ARETURN:      /* ..., retvalue ==> ...                      */
 
-#if defined(USE_THREADS)
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               s4 disp;
-                               a = dseg_addaddress((void *) (builtin_monitorexit));
-                               M_ALD(REG_ITMP3, REG_PV, a);
-                               M_JSR(REG_RA, REG_ITMP3);
-                               M_ALD(argintregs[0], REG_SP, maxmemuse * 8);    /* delay slot */
-                               disp = -(s4) ((u1 *) mcodeptr - mcodebase);
-                               M_LDA(REG_PV, REG_RA, disp);
+                       var_to_reg_int(s1, src, REG_RESULT);
+                       M_INTMOVE(s1, REG_RESULT);
+
+#ifdef ENABLE_VERIFIER
+                       if (iptr->val.a) {
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_athrow_areturn,
+                                                                       (unresolved_class *) iptr->val.a, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
                        }
-#endif
+#endif /* ENABLE_VERIFIER */
+                       goto nowperformreturn;
+
+           case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
+           case ICMD_DRETURN:
                        var_to_reg_flt(s1, src, REG_FRESULT);
                        {
                                int t = ((iptr->opc == ICMD_FRETURN) ? TYPE_FLT : TYPE_DBL);
@@ -2949,66 +2757,119 @@ void codegen()
 
                case ICMD_RETURN:      /* ...  ==> ...                                */
 
-#if defined(USE_THREADS)
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               s4 disp;
-                               a = dseg_addaddress((void *) (builtin_monitorexit));
-                               M_ALD(REG_ITMP3, REG_PV, a);
-                               M_JSR(REG_RA, REG_ITMP3);
-                               M_ALD(argintregs[0], REG_SP, maxmemuse * 8);    /* delay slot */
-                               disp = -(s4) ((u1 *) mcodeptr - mcodebase);
-                               M_LDA(REG_PV, REG_RA, disp);
-                       }
-#endif
-
 nowperformreturn:
                        {
-                       int r, p;
+                       s4 i, p;
                        
                        p = parentargs_base;
                        
+                       /* call trace function */
+
+                       if (opt_verbosecall) {
+                               M_LDA(REG_SP, REG_SP, -3 * 8);
+                               M_LST(REG_RA, REG_SP, 0 * 8);
+                               M_LST(REG_RESULT, REG_SP, 1 * 8);
+                               M_DST(REG_FRESULT, REG_SP, 2 * 8);
+
+                               disp = dseg_addaddress(cd, m);
+                               M_ALD(rd->argintregs[0], REG_PV, disp);
+                               M_MOV(REG_RESULT, rd->argintregs[1]);
+                               M_FLTMOVE(REG_FRESULT, rd->argfltregs[2]);
+                               M_FMOV(REG_FRESULT, rd->argfltregs[3]);
+
+                               disp = dseg_addaddress(cd, (void *) builtin_displaymethodstop);
+                               M_ALD(REG_ITMP3, REG_PV, disp);
+                               M_JSR(REG_RA, REG_ITMP3);
+                               M_NOP;
+
+                               M_DLD(REG_FRESULT, REG_SP, 2 * 8);
+                               M_LLD(REG_RESULT, REG_SP, 1 * 8);
+                               M_LLD(REG_RA, REG_SP, 0 * 8);
+                               M_LDA(REG_SP, REG_SP, 3 * 8);
+                       }
+
+#if defined(USE_THREADS)
+                       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+                               disp = dseg_addaddress(cd, (void *) builtin_monitorexit);
+                               M_ALD(REG_ITMP3, REG_PV, disp);
+
+                               /* we need to save the proper return value */
+
+                               switch (iptr->opc) {
+                               case ICMD_IRETURN:
+                               case ICMD_ARETURN:
+                               case ICMD_LRETURN:
+                                       M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8);
+                                       M_JSR(REG_RA, REG_ITMP3);
+                                       M_LST(REG_RESULT, REG_SP, rd->memuse * 8);  /* delay slot */
+                                       break;
+                               case ICMD_FRETURN:
+                               case ICMD_DRETURN:
+                                       M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8);
+                                       M_JSR(REG_RA, REG_ITMP3);
+                                       M_DST(REG_FRESULT, REG_SP, rd->memuse * 8); /* delay slot */
+                                       break;
+                               case ICMD_RETURN:
+                                       M_JSR(REG_RA, REG_ITMP3);
+                                       M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 8); /* delay*/
+                                       break;
+                               }
+
+                               /* and now restore the proper return value */
+
+                               switch (iptr->opc) {
+                               case ICMD_IRETURN:
+                               case ICMD_ARETURN:
+                               case ICMD_LRETURN:
+                                       M_LLD(REG_RESULT, REG_SP, rd->memuse * 8);
+                                       break;
+                               case ICMD_FRETURN:
+                               case ICMD_DRETURN:
+                                       M_DLD(REG_FRESULT, REG_SP, rd->memuse * 8);
+                                       break;
+                               }
+                       }
+#endif
+
                        /* restore return address                                         */
 
-                       if (!isleafmethod)
-                               {p--;  M_LLD (REG_RA, REG_SP, 8 * p);}
+                       if (!m->isleafmethod) {
+                               p--; M_ALD(REG_RA, REG_SP, p * 8);
+                       }
 
                        /* restore saved registers                                        */
 
-                       for (r = savintregcnt - 1; r >= maxsavintreguse; r--)
-                                       {p--; M_LLD(savintregs[r], REG_SP, 8 * p);}
-                       for (r = savfltregcnt - 1; r >= maxsavfltreguse; r--)
-                                       {p--; M_DLD(savfltregs[r], REG_SP, 8 * p);}
+                       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+                               p--; M_LLD(rd->savintregs[i], REG_SP, p * 8);
+                       }
+                       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+                               p--; M_DLD(rd->savfltregs[i], REG_SP, p * 8);
+                       }
 
-                       /* call trace function */
+                       /* deallocate stack and return                                    */
 
-                       if (runverbose) {
-                               M_LDA (REG_SP, REG_SP, -24);
-                               M_LST(REG_RA, REG_SP, 0);
-                               M_LST(REG_RESULT, REG_SP, 8);
-                               M_DST(REG_FRESULT, REG_SP,16);
-                               a = dseg_addaddress (method);
-                               M_ALD(argintregs[0], REG_PV, a);
-                               M_MOV(REG_RESULT, argintregs[1]);
-                               M_FLTMOVE(REG_FRESULT, argfltregs[2]);
-                               M_FMOV(REG_FRESULT, argfltregs[3]);
-                               a = dseg_addaddress ((void*) (builtin_displaymethodstop));
-                               M_ALD(REG_ITMP3, REG_PV, a);
-                               M_JSR (REG_RA, REG_ITMP3);
-                               M_NOP;
-                               M_DLD(REG_FRESULT, REG_SP,16);
-                               M_LLD(REG_RESULT, REG_SP, 8);
-                               M_LLD(REG_RA, REG_SP, 0);
-                               M_LDA (REG_SP, REG_SP, 24);
-                               }
+                       if (parentargs_base) {
+                               s4 lo, hi;
 
-                       M_RET(REG_RA);
+                               disp = parentargs_base * 8;
+                               lo = (short) (disp);
+                               hi = (short) (((disp) - lo) >> 16);
 
-                       /* deallocate stack                                               */
+                               if (hi == 0) {
+                                       M_RET(REG_RA);
+                                       M_LADD_IMM(REG_SP, lo, REG_SP);             /* delay slot */
+                               } else {
+                                       M_LUI(REG_ITMP3,hi);
+                                       M_LADD_IMM(REG_ITMP3,lo,REG_ITMP3);
+                                       M_RET(REG_RA);
+                                       M_LADD(REG_ITMP3,REG_SP,REG_SP);            /* delay slot */
+                               }
+
+                       } else {
+                               M_RET(REG_RA);
+                               M_NOP;
+                       }
 
-                       if (parentargs_base)
-                               {M_LDA(REG_SP, REG_SP, parentargs_base*8);}
-                       else
-                               {M_NOP;}
                        ALIGNCODENOP;
                        }
                        break;
@@ -3041,7 +2902,7 @@ nowperformreturn:
 
                        M_CMPULT_IMM(REG_ITMP1, i, REG_ITMP2);
                        M_BEQZ(REG_ITMP2, 0);
-                       codegen_addreference((basicblock *) tptr[0], mcodeptr);
+                       codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
                        M_ASLL_IMM(REG_ITMP1, POINTERSHIFT, REG_ITMP1);      /* delay slot*/
 
                        /* build jump table top down and use address of lowest entry */
@@ -3050,8 +2911,8 @@ nowperformreturn:
                        tptr += i;
 
                        while (--i >= 0) {
-                               /* dseg_addtarget(BlockPtrOfPC(*--s4ptr)); */
-                               dseg_addtarget((basicblock *) tptr[0]); 
+                               /* dseg_addtarget(cd, BlockPtrOfPC(*--s4ptr)); */
+                               dseg_addtarget(cd, (basicblock *) tptr[0]); 
                                --tptr;
                                }
                        }
@@ -3059,7 +2920,7 @@ nowperformreturn:
                        /* length of dataseg after last dseg_addtarget is used by load */
 
                        M_AADD(REG_ITMP1, REG_PV, REG_ITMP2);
-                       M_ALD(REG_ITMP2, REG_ITMP2, -dseglen);
+                       M_ALD(REG_ITMP2, REG_ITMP2, -(cd->dseglen));
                        M_JMP(REG_ITMP2);
                        M_NOP;
                        ALIGNCODENOP;
@@ -3086,422 +2947,624 @@ nowperformreturn:
                                val = s4ptr[0];
                                ICONST(REG_ITMP2, val);
                                M_BEQ(s1, REG_ITMP2, 0);
-                               codegen_addreference((basicblock *) tptr[0], mcodeptr); 
+                               codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr); 
                                M_NOP;
                                }
 
                        M_BR(0);
                        tptr = (void **) iptr->target;
-                       codegen_addreference((basicblock *) tptr[0], mcodeptr);
+                       codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
                        M_NOP;
                        ALIGNCODENOP;
                        break;
                        }
 
 
-               case ICMD_BUILTIN3:     /* ..., arg1, arg2, arg3 ==> ...              */
-                                       /* op1 = return type, val.a = function pointer*/
-                       s3 = 3;
-                       goto gen_method;
+               case ICMD_BUILTIN:      /* ..., arg1 ==> ...                          */
+                                       /* op1 = arg count val.a = builtintable entry */
 
-               case ICMD_BUILTIN2:     /* ..., arg1, arg2 ==> ...                    */
-                                       /* op1 = return type, val.a = function pointer*/
-                       s3 = 2;
-                       goto gen_method;
-
-               case ICMD_BUILTIN1:     /* ..., arg1 ==> ...                          */
-                                       /* op1 = return type, val.a = function pointer*/
-                       s3 = 1;
+                       bte = iptr->val.a;
+                       md = bte->md;
                        goto gen_method;
 
                case ICMD_INVOKESTATIC: /* ..., [arg1, [arg2 ...]] ==> ...            */
                                        /* op1 = arg count, val.a = method pointer    */
 
                case ICMD_INVOKESPECIAL:/* ..., objectref, [arg1, [arg2 ...]] ==> ... */
-                                       /* op1 = arg count, val.a = method pointer    */
-
-               case ICMD_INVOKEVIRTUAL:/* ..., objectref, [arg1, [arg2 ...]] ==> ... */
-                                       /* op1 = arg count, val.a = method pointer    */
+               case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer    */
+               case ICMD_INVOKEINTERFACE:
 
-               case ICMD_INVOKEINTERFACE:/*.., objectref, [arg1, [arg2 ...]] ==> ... */
-                                       /* op1 = arg count, val.a = method pointer    */
+                       lm = iptr->val.a;
 
-                       s3 = iptr->op1;
+                       if (lm == NULL) {
+                               unresolved_method *um = iptr->target;
+                               md = um->methodref->parseddesc.md;
+                       } else {
+                               md = lm->parseddesc;
+                       }
 
-gen_method: {
-                       methodinfo   *m;
-                       classinfo    *ci;
+gen_method:
+                       s3 = md->paramcount;
 
                        MCODECHECK((s3 << 1) + 64);
 
                        /* copy arguments to registers or stack location                  */
 
-                       for (; --s3 >= 0; src = src->prev) {
+                       for (s3 = s3 - 1; s3 >= 0; s3--, src = src->prev) {
                                if (src->varkind == ARGVAR)
                                        continue;
                                if (IS_INT_LNG_TYPE(src->type)) {
-                                       if (s3 < INT_ARG_CNT) {
-                                               s1 = argintregs[s3];
+                                       if (!md->params[s3].inmemory) {
+                                               s1 = rd->argintregs[md->params[s3].regoff];
                                                var_to_reg_int(d, src, s1);
                                                M_INTMOVE(d, s1);
-                                               }
-                                       else  {
+                                       } else  {
                                                var_to_reg_int(d, src, REG_ITMP1);
-                                               M_LST(d, REG_SP, 8 * (s3 - INT_ARG_CNT));
-                                               }
+                                               M_LST(d, REG_SP, md->params[s3].regoff * 8);
                                        }
-                               else
-                                       if (s3 < FLT_ARG_CNT) {
-                                               s1 = argfltregs[s3];
+
+                               } else {
+                                       if (!md->params[s3].inmemory) {
+                                               s1 = rd->argfltregs[md->params[s3].regoff];
                                                var_to_reg_flt(d, src, s1);
-                                               M_TFLTMOVE(src->type,d, s1);
-                                               }
-                                       else {
+                                               M_TFLTMOVE(src->type, d, s1);
+                                       } else {
                                                var_to_reg_flt(d, src, REG_FTMP1);
-                                               M_DST(d, REG_SP, 8 * (s3 - FLT_ARG_CNT));
-                                               }
-                               } /* end of for */
+                                               M_DST(d, REG_SP, md->params[s3].regoff * 8);
+                                       }
+                               }
+                       }
 
-                       m = iptr->val.a;
                        switch (iptr->opc) {
-                               case ICMD_BUILTIN3:
-                               case ICMD_BUILTIN2:
-                               case ICMD_BUILTIN1:
-                                       a = dseg_addaddress ((void*) (m));
-                                       M_ALD(REG_ITMP3, REG_PV, a); /* built-in-function pointer */
-                                       M_JSR (REG_RA, REG_ITMP3);
+                       case ICMD_BUILTIN:
+                               disp = dseg_addaddress(cd, bte->fp);
+                               d = md->returntype.type;
+
+                               M_ALD(REG_ITMP3, REG_PV, disp);  /* built-in-function pointer */
+                               M_JSR(REG_RA, REG_ITMP3);
+                               M_NOP;
+                               disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+                               M_LDA(REG_PV, REG_RA, -disp);
+
+                               /* if op1 == true, we need to check for an exception */
+
+                               if (iptr->op1 == true) {
+                                       M_BEQZ(REG_RESULT, 0);
+                                       codegen_add_fillinstacktrace_ref(cd, mcodeptr);
                                        M_NOP;
-                                       d = iptr->op1;                             /* return type */
-                                       goto afteractualcall;
+                               }
+                               break;
 
-                               case ICMD_INVOKESTATIC:
-                               case ICMD_INVOKESPECIAL:
-                                       a = dseg_addaddress (m->stubroutine);
+                       case ICMD_INVOKESPECIAL:
+                               M_BEQZ(rd->argintregs[0], 0);
+                               codegen_add_nullpointerexception_ref(cd, mcodeptr);
+                               M_NOP;
+                               /* fall through */
 
-                                       M_ALD(REG_PV, REG_PV, a );        /* method pointer in pv */
+                       case ICMD_INVOKESTATIC:
+                               if (lm == NULL) {
+                                       unresolved_method *um = iptr->target;
 
-                                       d = m->returntype;
-                                       goto makeactualcall;
+                                       disp = dseg_addaddress(cd, NULL);
 
-                               case ICMD_INVOKEVIRTUAL:
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_invokestatic_special, um, disp);
 
-                                       gen_nullptr_check(argintregs[0]);
-                                       M_ALD(REG_METHODPTR, argintregs[0],
-                                                                OFFSET(java_objectheader, vftbl));
-                                       M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl, table[0]) +
-                                                               sizeof(methodptr) * m->vftblindex);
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
+                                       }
 
-                                       d = m->returntype;
-                                       goto makeactualcall;
+                                       d = um->methodref->parseddesc.md->returntype.type;
 
-                               case ICMD_INVOKEINTERFACE:
-                                       ci = m->class;
-                                       
-                                       gen_nullptr_check(argintregs[0]);
-                                       M_ALD(REG_METHODPTR, argintregs[0],
-                                                                OFFSET(java_objectheader, vftbl));    
-                                       M_ALD(REG_METHODPTR, REG_METHODPTR,
-                                             OFFSET(vftbl, interfacetable[0]) -
-                                             sizeof(methodptr*) * ci->index);
-                                       M_ALD(REG_PV, REG_METHODPTR,
-                                                           sizeof(methodptr) * (m - ci->methods));
-
-                                       d = m->returntype;
-                                       goto makeactualcall;
-
-                               default:
-                                       d = 0;
-                                       error ("Unkown ICMD-Command: %d", iptr->opc);
+                               } else {
+                                       disp = dseg_addaddress(cd, lm->stubroutine);
+                                       d = lm->parseddesc->returntype.type;
                                }
 
-makeactualcall:
+                               M_ALD(REG_PV, REG_PV, disp);          /* method pointer in pv */
+                               M_JSR(REG_RA, REG_PV);
+                               M_NOP;
+                               disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+                               M_LDA(REG_PV, REG_RA, -disp);
+                               break;
 
-                       M_JSR (REG_RA, REG_PV);
-                       M_NOP;
+                       case ICMD_INVOKEVIRTUAL:
+                               gen_nullptr_check(rd->argintregs[0]);
 
-                       /* recompute pv */
+                               if (lm == NULL) {
+                                       unresolved_method *um = iptr->target;
 
-afteractualcall:
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_invokevirtual, um, 0);
 
-                       s1 = (s4) ((u1 *) mcodeptr - mcodebase);
-                       if (s1 <= 32768) M_LDA(REG_PV, REG_RA, -s1);
-                       else {
-                               s4 ml = -s1, mh = 0;
-                               while (ml < -32768) { ml += 65536; mh--; }
-                               M_LUI(REG_PV, mh);
-                               M_IADD_IMM(REG_PV, ml, REG_PV);
-                               M_LADD(REG_PV, REG_RA, REG_PV);
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
+                                       }
+
+                                       s1 = 0;
+                                       d = um->methodref->parseddesc.md->returntype.type;
+
+                               } else {
+                                       s1 = OFFSET(vftbl_t, table[0]) +
+                                               sizeof(methodptr) * lm->vftblindex;
+                                       d = lm->parseddesc->returntype.type;
+                               }
+
+                               M_ALD(REG_METHODPTR, rd->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));
+                               M_ALD(REG_PV, REG_METHODPTR, s1);
+                               M_JSR(REG_RA, REG_PV);
+                               M_NOP;
+                               disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+                               M_LDA(REG_PV, REG_RA, -disp);
+                               break;
+
+                       case ICMD_INVOKEINTERFACE:
+                               gen_nullptr_check(rd->argintregs[0]);
+
+                               if (lm == NULL) {
+                                       unresolved_method *um = iptr->target;
+
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_invokeinterface, um, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
+                                       }
+
+                                       s1 = 0;
+                                       s2 = 0;
+                                       d = um->methodref->parseddesc.md->returntype.type;
+
+                               } else {
+                                       s1 = OFFSET(vftbl_t, interfacetable[0]) -
+                                               sizeof(methodptr*) * lm->class->index;
+
+                                       s2 = sizeof(methodptr) * (lm - lm->class->methods);
+
+                                       d = lm->parseddesc->returntype.type;
+                               }
+
+                               M_ALD(REG_METHODPTR, rd->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));
+                               M_ALD(REG_METHODPTR, REG_METHODPTR, s1);
+                               M_ALD(REG_PV, REG_METHODPTR, s2);
+                               M_JSR(REG_RA, REG_PV);
+                               M_NOP;
+                               disp = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+                               M_LDA(REG_PV, REG_RA, -disp);
+                               break;
                        }
 
                        /* d contains return type */
 
                        if (d != TYPE_VOID) {
                                if (IS_INT_LNG_TYPE(iptr->dst->type)) {
-                                       s1 = reg_of_var(iptr->dst, REG_RESULT);
+                                       s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
                                        M_INTMOVE(REG_RESULT, s1);
                                        store_reg_to_var_int(iptr->dst, s1);
-                                       }
-                               else {
-                                       s1 = reg_of_var(iptr->dst, REG_FRESULT);
+                               } else {
+                                       s1 = reg_of_var(rd, iptr->dst, REG_FRESULT);
                                        M_TFLTMOVE(iptr->dst->type, REG_FRESULT, s1);
                                        store_reg_to_var_flt(iptr->dst, s1);
-                                       }
                                }
                        }
                        break;
 
 
-               case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult            */
-
+               case ICMD_CHECKCAST:  /* ..., objectref ==> ..., objectref            */
                                      /* op1:   0 == array, 1 == class                */
                                      /* 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));
- */
+                       /*  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->diffvall));
+                        */
+
+                       if (iptr->op1 == 1) {
+                               classinfo *super;
+                               vftbl_t   *supervftbl;
+                               s4         superindex;
+
+                               super = (classinfo *) iptr->val.a;
+
+                               if (!super) {
+                                       superindex = 0;
+                                       supervftbl = NULL;
 
-                       {
-                       classinfo *super = (classinfo*) iptr->val.a;
+                               } else {
+                                       superindex = super->index;
+                                       supervftbl = super->vftbl;
+                               }
                        
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                       codegen_threadcritrestart((u1*) mcodeptr - mcodebase);
+                               codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
 #endif
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       if (s1 == d) {
-                               M_MOV(s1, REG_ITMP1);
-                               s1 = REG_ITMP1;
-                               }
-                       M_CLR(d);
-                       if (iptr->op1) {                               /* class/interface */
-                               if (super->flags & ACC_INTERFACE) {        /* interface       */
-                                       M_BEQZ(s1, 8);
-                                       M_NOP;
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                                       M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl, interfacetablelength));
-                                       M_IADD_IMM(REG_ITMP2, - super->index, REG_ITMP2);
-                                       M_BLEZ(REG_ITMP2, 3);
+
+                               var_to_reg_int(s1, src, REG_ITMP1);
+
+                               /* calculate interface checkcast code size */
+
+                               s2 = 8;
+                               if (!super)
+                                       s2 += (opt_showdisassemble ? 2 : 0);
+
+                               /* calculate class checkcast code size */
+
+                               s3 = 10 /* 10 + (s1 == REG_ITMP1) */;
+                               if (!super)
+                                       s3 += (opt_showdisassemble ? 2 : 0);
+
+                               /* if class is not resolved, check which code to call */
+
+                               if (!super) {
+                                       M_BEQZ(s1, 5 + (opt_showdisassemble ? 2 : 0) + s2 + 2 + s3);
                                        M_NOP;
-                                       M_ALD(REG_ITMP1, REG_ITMP1,
-                                             OFFSET(vftbl, interfacetable[0]) -
-                                             super->index * sizeof(methodptr*));
-                                       M_CMPULT(REG_ZERO, REG_ITMP1, d);      /* REG_ITMP1 != 0  */
+
+                                       disp = dseg_adds4(cd, 0);                 /* super->flags */
+
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_checkcast_instanceof_flags,
+                                                                               (constant_classref *) iptr->target,
+                                                                               disp);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
                                        }
-                               else {                                     /* class           */
-                                       /*
-                                       s2 = super->vftbl->diffval;
-                                       M_BEQZ(s1, 5);
+
+                                       /* XXX TWISTI M_ILD can be 2 instructions long (jump offset) */
+                                       M_ILD(REG_ITMP2, REG_PV, disp);
+                                       M_AND_IMM(REG_ITMP2, ACC_INTERFACE, REG_ITMP2);
+                                       M_BEQZ(REG_ITMP2, 1 + s2 + 2);
                                        M_NOP;
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                                       M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
-                                       M_IADD_IMM(REG_ITMP1, - super->vftbl->baseval, REG_ITMP1);
-                                       M_CMPULT_IMM(REG_ITMP1, s2 + 1, d);
-                                       */
+                               }
+
+                               /* interface checkcast code */
+
+                               if (!super || super->flags & ACC_INTERFACE) {
+                                       if (super) {
+                                               M_BEQZ(s1, 1 + s2);
+                                               M_NOP;
+
+                                       } else {
+                                               codegen_addpatchref(cd, mcodeptr,
+                                                                                       PATCHER_checkcast_instanceof_interface,
+                                                                                       (constant_classref *) iptr->target,
+                                                                                       0);
+
+                                               if (opt_showdisassemble) {
+                                                       M_NOP; M_NOP;
+                                               }
+                                       }
 
-                                       M_BEQZ(s1, 9);
+                                       M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+                                       M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
+                                       M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
+                                       M_BLEZ(REG_ITMP3, 0);
+                                       codegen_add_classcastexception_ref(cd, mcodeptr);
                                        M_NOP;
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                    a = dseg_addaddress ((void*) super->vftbl);
-                    M_ALD(REG_ITMP2, REG_PV, a);
+                                       M_ALD(REG_ITMP3, REG_ITMP2,
+                                                 OFFSET(vftbl_t, interfacetable[0]) -
+                                                 superindex * sizeof(methodptr*));
+                                       M_BEQZ(REG_ITMP3, 0);
+                                       codegen_add_classcastexception_ref(cd, mcodeptr);
+                                       M_NOP;
+
+                                       if (!super) {
+                                               M_BR(1 + s3);
+                                               M_NOP;
+                                       }
+                               }
+
+                               /* class checkcast code */
+
+                               if (!super || !(super->flags & ACC_INTERFACE)) {
+                                       disp = dseg_addaddress(cd, (void *) supervftbl);
+
+                                       if (super) {
+                                               M_BEQZ(s1, 1 + s3);
+                                               M_NOP;
+
+                                       } else {
+                                               codegen_addpatchref(cd, mcodeptr,
+                                                                                       PATCHER_checkcast_instanceof_class,
+                                                                                       (constant_classref *) iptr->target,
+                                                                                       disp);
+
+                                               if (opt_showdisassemble) {
+                                                       M_NOP; M_NOP;
+                                               }
+                                       }
+
+                                       M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+                                       M_ALD(REG_ITMP3, REG_PV, disp);
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       codegen_threadcritstart((u1*) mcodeptr - mcodebase);
+                                       codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
 #endif
-                    M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
-                    M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl, baseval));
-                    M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, diffval));
+                                       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(USE_THREADS) && defined(NATIVE_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_ITMP3, REG_PV, disp);
+                                       M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       codegen_threadcritstop((u1*) mcodeptr - mcodebase);
+                                       codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
 #endif
-                    M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1); 
-                    M_CMPULT(REG_ITMP2, REG_ITMP1, d);
-                                       M_XOR_IMM(d, 1, d);
+                                       /*                              } */
+                                       M_CMPULT(REG_ITMP3, REG_ITMP2, REG_ITMP3);
+                                       M_BNEZ(REG_ITMP3, 0);
+                                       codegen_add_classcastexception_ref(cd, mcodeptr);
+                                       M_NOP;
+                               }
+                               d = reg_of_var(rd, iptr->dst, s1);
+
+                       } else {
+                               var_to_reg_int(s1, src, rd->argintregs[0]);
+                               M_INTMOVE(s1, rd->argintregs[0]);
 
+                               disp = dseg_addaddress(cd, iptr->val.a);
+
+                               if (iptr->val.a == NULL) {
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_builtin_arraycheckcast,
+                                                                               (constant_classref *) iptr->target,
+                                                                               disp);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
                                        }
                                }
-                       else
-                               panic ("internal error: no inlined array instanceof");
+
+                               M_ALD(rd->argintregs[1], REG_PV, disp);
+                               disp = dseg_addaddress(cd, BUILTIN_arraycheckcast);
+                               M_ALD(REG_ITMP3, REG_PV, disp);
+                               M_JSR(REG_RA, REG_ITMP3);
+                               M_NOP;
+
+                               M_BEQZ(REG_RESULT, 0);
+                               codegen_add_classcastexception_ref(cd, mcodeptr);
+                               M_NOP;
+
+                               var_to_reg_int(s1, src, REG_ITMP1);
+                               d = reg_of_var(rd, iptr->dst, s1);
                        }
+                       M_INTMOVE(s1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_CHECKCAST:  /* ..., objectref ==> ..., objectref            */
-
+               case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult            */
                                      /* op1:   0 == array, 1 == class                */
                                      /* 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->diffvall));
- */
+                       /*  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 = (classinfo*) iptr->val.a;
+                       classinfo *super;
+                       vftbl_t   *supervftbl;
+                       s4         superindex;
+
+                       super = (classinfo *) iptr->val.a;
+
+                       if (!super) {
+                               superindex = 0;
+                               supervftbl = NULL;
+
+                       } else {
+                               superindex = super->index;
+                               supervftbl = super->vftbl;
+                       }
                        
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                       codegen_threadcritrestart((u1*) mcodeptr - mcodebase);
+                       codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
 #endif
 
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       var_to_reg_int(s1, src, d);
-                       if (iptr->op1) {                               /* class/interface */
-                               if (super->flags & ACC_INTERFACE) {        /* interface       */
-                                       M_BEQZ(s1, 9);
-                                       M_NOP;
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                                       M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl, interfacetablelength));
-                                       M_IADD_IMM(REG_ITMP2, - super->index, REG_ITMP2);
-                                       M_BLEZ(REG_ITMP2, 0);
-                                       codegen_addxcastrefs(mcodeptr);
-                                       M_NOP;
-                                       M_ALD(REG_ITMP2, REG_ITMP1,
-                                             OFFSET(vftbl, interfacetable[0]) -
-                                             super->index * sizeof(methodptr*));
-                                       M_BEQZ(REG_ITMP2, 0);
-                                       codegen_addxcastrefs(mcodeptr);
-                                       M_NOP;
-                                       }
-                               else {                                     /* class           */
+                       var_to_reg_int(s1, src, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                       if (s1 == d) {
+                               M_MOV(s1, REG_ITMP1);
+                               s1 = REG_ITMP1;
+                       }
 
-                                       /*
-                                       s2 = super->vftbl->diffval;
-                                       M_BEQZ(s1, 6 + (s2 != 0));
-                                       M_NOP;
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                                       M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
-                                       M_IADD_IMM(REG_ITMP1, - super->vftbl->baseval, REG_ITMP1);
-                                       if (s2 == 0) {
-                                               M_BNEZ(REG_ITMP1, 0);
-                                               }
-                                       else{
-                                               M_CMPULT_IMM(REG_ITMP1, s2 + 1, REG_ITMP2);
-                                               M_BEQZ(REG_ITMP2, 0);
-                                               }
-                                       */
+                       /* calculate interface instanceof code size */
+
+                       s2 = 7;
+                       if (!super)
+                               s2 += (opt_showdisassemble ? 2 : 0);
+
+                       /* calculate class instanceof code size */
+
+                       s3 = 8;
+                       if (!super)
+                               s3 += (opt_showdisassemble ? 2 : 0);
+
+                       M_CLR(d);
+
+                       /* if class is not resolved, check which code to call */
+
+                       if (!super) {
+                               M_BEQZ(s1, 5 + (opt_showdisassemble ? 2 : 0) + s2 + 2 + s3);
+                               M_NOP;
 
-                                       M_BEQZ(s1, 10 + (d == REG_ITMP3));
+                               disp = dseg_adds4(cd, 0);                     /* super->flags */
+
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_checkcast_instanceof_flags,
+                                                                       (constant_classref *) iptr->target, disp);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+
+                               /* XXX TWISTI M_ILD can be 2 instructions long (jump offset) */
+                               M_ILD(REG_ITMP3, REG_PV, disp);
+                               M_AND_IMM(REG_ITMP3, ACC_INTERFACE, REG_ITMP3);
+                               M_BEQZ(REG_ITMP3, 1 + s2 + 2);
+                               M_NOP;
+                       }
+
+                       /* interface instanceof code */
+
+                       if (!super || (super->flags & ACC_INTERFACE)) {
+                               if (super) {
+                                       M_BEQZ(s1, 1 + s2);
                                        M_NOP;
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                    a = dseg_addaddress ((void*) super->vftbl);
-                    M_ALD(REG_ITMP2, REG_PV, a);
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       codegen_threadcritstart((u1*) mcodeptr - mcodebase);
-#endif
-                    M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
-                                       if (d != REG_ITMP3) {
-                                               M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl, baseval));
-                                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, diffval));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                               codegen_threadcritstop((u1*) mcodeptr - mcodebase);
-#endif
-                                               M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1); 
-                                       } else {
-                                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, baseval));
-                                               M_ISUB(REG_ITMP1, REG_ITMP2, REG_ITMP1); 
-                                               M_ALD(REG_ITMP2, REG_PV, a);
-                                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, diffval));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                               codegen_threadcritstop((u1*) mcodeptr - mcodebase);
-#endif
+
+                               } else {
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_checkcast_instanceof_interface,
+                                                                               (constant_classref *) iptr->target, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
                                        }
-                    M_CMPULT(REG_ITMP2, REG_ITMP1, REG_ITMP2);
-                                       M_BNEZ(REG_ITMP2, 0);
+                               }
+
+                               M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+                               M_ILD(REG_ITMP3, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
+                               M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
+                               M_BLEZ(REG_ITMP3, 3);
+                               M_NOP;
+                               M_ALD(REG_ITMP1, REG_ITMP1,
+                                         OFFSET(vftbl_t, interfacetable[0]) -
+                                         superindex * sizeof(methodptr*));
+                               M_CMPULT(REG_ZERO, REG_ITMP1, d);      /* REG_ITMP1 != 0  */
 
-                                       codegen_addxcastrefs(mcodeptr);
+                               if (!super) {
+                                       M_BR(1 + s3);
                                        M_NOP;
-                                       }
                                }
-                       else
-                               panic ("internal error: no inlined array checkcast");
                        }
-                       M_INTMOVE(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
 
-               case ICMD_CHECKASIZE:  /* ..., size ==> ..., size                     */
+                       /* class instanceof code */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       M_BLTZ(s1, 0);
-                       codegen_addxcheckarefs(mcodeptr);
-                       M_NOP;
-                       break;
+                       if (!super || !(super->flags & ACC_INTERFACE)) {
+                               disp = dseg_addaddress(cd, supervftbl);
 
-               case ICMD_CHECKEXCEPTION:  /* ... ==> ...                             */
+                               if (super) {
+                                       M_BEQZ(s1, 1 + s3);
+                                       M_NOP;
 
-                       M_BEQZ(REG_RESULT, 0);
-                       codegen_addxexceptionrefs(mcodeptr);
-                       M_NOP;
+                               } else {
+                                       codegen_addpatchref(cd, mcodeptr,
+                                                                               PATCHER_checkcast_instanceof_class,
+                                                                               (constant_classref *) iptr->target,
+                                                                               disp);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP;
+                                       }
+                               }
+
+                               M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+                               M_ALD(REG_ITMP2, REG_PV, disp);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                               codegen_threadcritstart(cd, (u1 *) 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(USE_THREADS) && defined(NATIVE_THREADS)
+                               codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
+                               M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1); 
+                               M_CMPULT(REG_ITMP2, REG_ITMP1, d);
+                               M_XOR_IMM(d, 1, d);
+                       }
+                       store_reg_to_var_int(iptr->dst, d);
+                       }
                        break;
 
                case ICMD_MULTIANEWARRAY:/* ..., cnt1, [cnt2, ...] ==> ..., arrayref  */
-                                     /* op1 = dimension, val.a = array descriptor    */
+                                     /* op1 = dimension, val.a = class               */
 
                        /* check for negative sizes and copy sizes to stack if necessary  */
 
                        MCODECHECK((iptr->op1 << 1) + 64);
 
                        for (s1 = iptr->op1; --s1 >= 0; src = src->prev) {
-                               var_to_reg_int(s2, src, REG_ITMP1);
-                               M_BLTZ(s2, 0);
-                               codegen_addxcheckarefs(mcodeptr);
-                               M_NOP;
-
-                               /* copy sizes to stack (argument numbers >= INT_ARG_CNT)      */
+                               /* copy SAVEDVAR sizes to stack */
 
                                if (src->varkind != ARGVAR) {
-                                       M_LST(s2, REG_SP, 8 * (s1 + INT_ARG_CNT));
-                                       }
+                                       var_to_reg_int(s2, src, REG_ITMP1);
+                                       M_LST(s2, REG_SP, s1 * 8);
                                }
+                       }
 
                        /* a0 = dimension count */
 
-                       ICONST(argintregs[0], iptr->op1);
+                       ICONST(rd->argintregs[0], iptr->op1);
+
+                       /* is patcher function set? */
+
+                       if (iptr->val.a == NULL) {
+                               disp = dseg_addaddress(cd, NULL);
+
+                               codegen_addpatchref(cd, mcodeptr,
+                                                                       PATCHER_builtin_multianewarray,
+                                                                       (constant_classref *) iptr->target,
+                                                                       disp);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP;
+                               }
+
+                       } else {
+                               disp = dseg_addaddress(cd, iptr->val.a);
+                       }
 
                        /* a1 = arraydescriptor */
 
-                       a = dseg_addaddress(iptr->val.a);
-                       M_ALD(argintregs[1], REG_PV, a);
+                       M_ALD(rd->argintregs[1], REG_PV, disp);
 
                        /* a2 = pointer to dimensions = stack pointer */
 
-                       M_INTMOVE(REG_SP, argintregs[2]);
+                       M_INTMOVE(REG_SP, rd->argintregs[2]);
 
-                       a = dseg_addaddress((void*) (builtin_nmultianewarray));
-                       M_ALD(REG_ITMP3, REG_PV, a);
+                       disp = dseg_addaddress(cd, BUILTIN_multianewarray);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
                        M_JSR(REG_RA, REG_ITMP3);
                        M_NOP;
-                       s1 = (int)((u1*) mcodeptr - mcodebase);
-                       if (s1 <= 32768)
-                               M_LDA (REG_PV, REG_RA, -s1);
-                       else {
-                               panic("To big");
-                           }
-                       s1 = reg_of_var(iptr->dst, REG_RESULT);
-                       M_INTMOVE(REG_RESULT, s1);
-                       store_reg_to_var_int(iptr->dst, s1);
-                       break;
 
+                       /* check for exception before result assignment */
 
-               default: error ("Unknown pseudo command: %d", iptr->opc);
-       
-   
+                       M_BEQZ(REG_RESULT, 0);
+                       codegen_add_fillinstacktrace_ref(cd, mcodeptr);
+                       M_NOP;
 
+                       d = reg_of_var(rd, iptr->dst, REG_RESULT);
+                       M_INTMOVE(REG_RESULT, d);
+                       store_reg_to_var_int(iptr->dst, d);
+                       break;
+
+               default:
+                       *exceptionptr = new_internalerror("Unknown ICMD %d", iptr->opc);
+                       return false;
        } /* switch */
                
        } /* for instruction */
@@ -3511,50 +3574,184 @@ afteractualcall:
        src = bptr->outstack;
        len = bptr->outdepth;
        MCODECHECK(64+len);
+#if defined(ENABLE_LSRA)
+       if (!opt_lsra) 
+#endif
        while (src) {
                len--;
                if ((src->varkind != STACKVAR)) {
                        s2 = src->type;
                        if (IS_FLT_DBL_TYPE(s2)) {
                                var_to_reg_flt(s1, src, REG_FTMP1);
-                               if (!(interfaces[len][s2].flags & INMEMORY)) {
-                                       M_TFLTMOVE(s2,s1,interfaces[len][s2].regoff);
-                                       }
-                               else {
-                                       M_DST(s1, REG_SP, 8 * interfaces[len][s2].regoff);
-                                       }
+                               if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+                                       M_TFLTMOVE(s2, s1, rd->interfaces[len][s2].regoff);
+
+                               } else {
+                                       M_DST(s1, REG_SP, 8 * rd->interfaces[len][s2].regoff);
                                }
-                       else {
+
+                       } else {
                                var_to_reg_int(s1, src, REG_ITMP1);
-                               if (!(interfaces[len][s2].flags & INMEMORY)) {
-                                       M_INTMOVE(s1,interfaces[len][s2].regoff);
-                                       }
-                               else {
-                                       M_LST(s1, REG_SP, 8 * interfaces[len][s2].regoff);
-                                       }
+                               if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+                                       M_INTMOVE(s1, rd->interfaces[len][s2].regoff);
+
+                               } else {
+                                       M_LST(s1, REG_SP, 8 * rd->interfaces[len][s2].regoff);
                                }
                        }
+               }
                src = src->prev;
+       }
+
+       /* At the end of a basic block we may have to append some nops,
+          because the patcher stub calling code might be longer than the
+          actual instruction. So codepatching does not change the
+          following block unintentionally. */
+
+       if ((u1 *) mcodeptr < cd->lastmcodeptr) {
+               while ((u1 *) mcodeptr < cd->lastmcodeptr) {
+                       M_NOP;
                }
+       }
+
        } /* if (bptr -> flags >= BBREACHED) */
        } /* for basic block */
 
-       /* bptr -> mpc = (int)((u1*) mcodeptr - mcodebase); */
+       dseg_createlinenumbertable(cd);
+
+#if 0
+       {
+       s4        *xcodeptr;
+       branchref *bref;
+
+       /* generate ArithmeticException stubs */
+
+       xcodeptr = NULL;
+       
+       for (bref = cd->xdivrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 (u1 *) mcodeptr - cd->mcodebase);
+
+               MCODECHECK(100);
+
+               if (xcodeptr != NULL) {
+                       M_BR(xcodeptr - mcodeptr);
+                       M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);  /* delay */
+
+               } else {
+                       M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+
+                       xcodeptr = mcodeptr;
+
+                       M_MOV(REG_PV, rd->argintregs[0]);
+                       M_MOV(REG_SP, rd->argintregs[1]);
+
+                       if (m->isleafmethod)
+                               M_MOV(REG_RA, rd->argintregs[2]);
+                       else
+                               M_ALD(rd->argintregs[2],
+                                         REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+
+                       M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+
+                       M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+                       if (m->isleafmethod)
+                               M_AST(REG_RA, REG_SP, 1 * 8);
+
+                       a = dseg_addaddress(cd, stacktrace_inline_arithmeticexception);
+                       M_ALD(REG_ITMP3, REG_PV, a);
+                       M_JSR(REG_RA, REG_ITMP3);
+                       M_NOP;
+                       M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+
+                       if (m->isleafmethod)
+                               M_ALD(REG_RA, REG_SP, 1 * 8);
+
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_AADD_IMM(REG_SP, 2 * 8, REG_SP);
+
+                       a = dseg_addaddress(cd, asm_handle_exception);
+                       M_ALD(REG_ITMP3, REG_PV, a);
+                       M_JMP(REG_ITMP3);
+                       M_NOP;
+               }
+       }
+
+       /* generate ArrayIndexOutOfBoundsException stubs */
+
+       xcodeptr = NULL;
+
+       for (bref = cd->xboundrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 (u1 *) mcodeptr - cd->mcodebase);
+
+               MCODECHECK(100);
+
+               /* move index register into REG_ITMP1 */
+
+               M_MOV(bref->reg, REG_ITMP1);
+               M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+
+               if (xcodeptr != NULL) {
+                       M_BR(xcodeptr - mcodeptr);
+                       M_NOP;
+
+               } else {
+                       xcodeptr = mcodeptr;
+
+                       M_MOV(REG_PV, rd->argintregs[0]);
+                       M_MOV(REG_SP, rd->argintregs[1]);
+
+                       if (m->isleafmethod)
+                               M_MOV(REG_RA, rd->argintregs[2]);
+                       else
+                               M_ALD(rd->argintregs[2],
+                                         REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+
+                       M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+                       M_MOV(REG_ITMP1, rd->argintregs[4]);
+
+                       M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+                       if (m->isleafmethod)
+                               M_AST(REG_RA, REG_SP, 1 * 8);
+
+                       a = dseg_addaddress(cd, stacktrace_inline_arrayindexoutofboundsexception);
+                       M_ALD(REG_ITMP3, REG_PV, a);
+                       M_JSR(REG_RA, REG_ITMP3);
+                       M_NOP;
+                       M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+
+                       if (m->isleafmethod)
+                               M_ALD(REG_RA, REG_SP, 1 * 8);
 
-       {
-       /* generate bound check stubs */
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_AADD_IMM(REG_SP, 2 * 8, REG_SP);
+
+                       a = dseg_addaddress(cd, asm_handle_exception);
+                       M_ALD(REG_ITMP3, REG_PV, a);
+                       M_JMP(REG_ITMP3);
+                       M_NOP;
+               }
+       }
 
-       s4 *xcodeptr = NULL;
+       /* generate ArrayStoreException stubs */
+
+       xcodeptr = NULL;
        
-       for (; xboundrefs != NULL; xboundrefs = xboundrefs->next) {
-               gen_resolvebranch((u1*) mcodebase + xboundrefs->branchpos, 
-                                 xboundrefs->branchpos,
-                                                 (u1*) mcodeptr - mcodebase);
+       for (bref = cd->xstorerefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 (u1 *) mcodeptr - cd->mcodebase);
 
-               MCODECHECK(8);
+               MCODECHECK(100);
 
-               M_MOV(xboundrefs->reg, REG_ITMP1);
-               M_LADD_IMM(REG_PV, xboundrefs->branchpos - 4, REG_ITMP2_XPC);
+               M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
 
                if (xcodeptr != NULL) {
                        M_BR(xcodeptr - mcodeptr);
@@ -3563,48 +3760,43 @@ afteractualcall:
                } else {
                        xcodeptr = mcodeptr;
 
-                       M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
-                       M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_MOV(REG_PV, rd->argintregs[0]);
+                       M_MOV(REG_SP, rd->argintregs[1]);
+                       M_ALD(rd->argintregs[2],
+                                 REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+                       M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
 
-                       a = dseg_addaddress(string_java_lang_ArrayIndexOutOfBoundsException);
-                       M_ALD(argintregs[0], REG_PV, a);
-                       M_MOV(REG_ITMP1, argintregs[1]);
+                       M_ASUB_IMM(REG_SP, 1 * 8, REG_SP);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
 
-                       a = dseg_addaddress(new_exception_int);
+                       a = dseg_addaddress(cd, stacktrace_inline_arraystoreexception);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JSR(REG_RA, REG_ITMP3);
                        M_NOP;
                        M_MOV(REG_RESULT, REG_ITMP1_XPTR);
 
-                       M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
-                       M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_AADD_IMM(REG_SP, 1 * 8, REG_SP);
 
-                       a = dseg_addaddress(asm_handle_exception);
+                       a = dseg_addaddress(cd, asm_handle_exception);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JMP(REG_ITMP3);
                        M_NOP;
                }
        }
 
-       /* generate negative array size check stubs */
+       /* generate ClassCastException stubs */
 
        xcodeptr = NULL;
        
-       for (; xcheckarefs != NULL; xcheckarefs = xcheckarefs->next) {
-               if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1*) mcodebase + xcheckarefs->branchpos, 
-                                                         xcheckarefs->branchpos,
-                                                         (u1*) xcodeptr - (u1*) mcodebase - 4);
-                       continue;
-               }
-
-               gen_resolvebranch((u1*) mcodebase + xcheckarefs->branchpos, 
-                                 xcheckarefs->branchpos,
-                                                 (u1*) mcodeptr - mcodebase);
+       for (bref = cd->xcastrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 (u1 *) mcodeptr - cd->mcodebase);
 
-               MCODECHECK(8);
+               MCODECHECK(100);
 
-               M_LADD_IMM(REG_PV, xcheckarefs->branchpos - 4, REG_ITMP2_XPC);
+               M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
 
                if (xcodeptr != NULL) {
                        M_BR(xcodeptr - mcodeptr);
@@ -3613,47 +3805,54 @@ afteractualcall:
                } else {
                        xcodeptr = mcodeptr;
 
-                       M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
-                       M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_MOV(REG_PV, rd->argintregs[0]);
+                       M_MOV(REG_SP, rd->argintregs[1]);
+
+                       if (m->isleafmethod)
+                               M_MOV(REG_RA, rd->argintregs[2]);
+                       else
+                               M_ALD(rd->argintregs[2],
+                                         REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+
+                       M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+
+                       M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
 
-                       a = dseg_addaddress(string_java_lang_NegativeArraySizeException);
-                       M_ALD(argintregs[0], REG_PV, a);
+                       if (m->isleafmethod)
+                               M_AST(REG_RA, REG_SP, 1 * 8);
 
-                       a = dseg_addaddress(new_exception);
+                       a = dseg_addaddress(cd, stacktrace_inline_classcastexception);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JSR(REG_RA, REG_ITMP3);
                        M_NOP;
                        M_MOV(REG_RESULT, REG_ITMP1_XPTR);
 
-                       M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
-                       M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+                       if (m->isleafmethod)
+                               M_ALD(REG_RA, REG_SP, 1 * 8);
 
-                       a = dseg_addaddress(asm_handle_exception);
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_AADD_IMM(REG_SP, 2 * 8, REG_SP);
+
+                       a = dseg_addaddress(cd, asm_handle_exception);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JMP(REG_ITMP3);
                        M_NOP;
                }
        }
 
-       /* generate cast check stubs */
+       /* generate NullPointerException stubs */
 
        xcodeptr = NULL;
-       
-       for (; xcastrefs != NULL; xcastrefs = xcastrefs->next) {
-               if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1*) mcodebase + xcastrefs->branchpos, 
-                                                         xcastrefs->branchpos,
-                                                         (u1*) xcodeptr - (u1*) mcodebase - 4);
-                       continue;
-               }
 
-               gen_resolvebranch((u1*) mcodebase + xcastrefs->branchpos, 
-                                 xcastrefs->branchpos,
-                                                 (u1*) mcodeptr - mcodebase);
+       for (bref = cd->xnullrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 (u1 *) mcodeptr - cd->mcodebase);
 
-               MCODECHECK(8);
+               MCODECHECK(100);
 
-               M_LADD_IMM(REG_PV, xcastrefs->branchpos - 4, REG_ITMP2_XPC);
+               M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
 
                if (xcodeptr != NULL) {
                        M_BR(xcodeptr - mcodeptr);
@@ -3662,22 +3861,36 @@ afteractualcall:
                } else {
                        xcodeptr = mcodeptr;
 
-                       M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
-                       M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_MOV(REG_PV, rd->argintregs[0]);
+                       M_MOV(REG_SP, rd->argintregs[1]);
+
+                       if (m->isleafmethod)
+                               M_MOV(REG_RA, rd->argintregs[2]);
+                       else
+                               M_ALD(rd->argintregs[2],
+                                         REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+
+                       M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
 
-                       a = dseg_addaddress(string_java_lang_ClassCastException);
-                       M_ALD(argintregs[0], REG_PV, a);
+                       M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
 
-                       a = dseg_addaddress(new_exception);
+                       if (m->isleafmethod)
+                               M_AST(REG_RA, REG_SP, 1 * 8);
+
+                       a = dseg_addaddress(cd, stacktrace_inline_nullpointerexception);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JSR(REG_RA, REG_ITMP3);
                        M_NOP;
                        M_MOV(REG_RESULT, REG_ITMP1_XPTR);
 
-                       M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
-                       M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+                       if (m->isleafmethod)
+                               M_ALD(REG_RA, REG_SP, 1 * 8);
+
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_AADD_IMM(REG_SP, 2 * 8, REG_SP);
 
-                       a = dseg_addaddress(asm_handle_exception);
+                       a = dseg_addaddress(cd, asm_handle_exception);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JMP(REG_ITMP3);
                        M_NOP;
@@ -3688,491 +3901,736 @@ afteractualcall:
 
        xcodeptr = NULL;
 
-       for (; xexceptionrefs != NULL; xexceptionrefs = xexceptionrefs->next) {
-               if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1*) mcodebase + xexceptionrefs->branchpos, 
-                                                         xexceptionrefs->branchpos,
-                                                         (u1*) xcodeptr - (u1*) mcodebase - 4);
-                       continue;
-               }
-
-               gen_resolvebranch((u1*) mcodebase + xexceptionrefs->branchpos, 
-                                 xexceptionrefs->branchpos,
-                                                 (u1*) mcodeptr - mcodebase);
+       for (bref = cd->xexceptionrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 (u1 *) mcodeptr - cd->mcodebase);
 
-               MCODECHECK(8);
-
-               M_LADD_IMM(REG_PV, xexceptionrefs->branchpos - 4, REG_ITMP2_XPC);
+               MCODECHECK(100);
 
                if (xcodeptr != NULL) {
                        M_BR(xcodeptr - mcodeptr);
-                       M_NOP;
+                       M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);  /* delay */
 
                } else {
+                       M_AADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+
                        xcodeptr = mcodeptr;
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                       M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
-                       M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_MOV(REG_PV, rd->argintregs[0]);
+                       M_MOV(REG_SP, rd->argintregs[1]);
+                       M_ALD(rd->argintregs[2],
+                                 REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+                       M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
 
-                       a = dseg_addaddress(builtin_get_exceptionptrptr);
+                       M_ASUB_IMM(REG_SP, 1 * 8, REG_SP);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+                       a = dseg_addaddress(cd, stacktrace_inline_fillInStackTrace);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JSR(REG_RA, REG_ITMP3);
                        M_NOP;
                        M_MOV(REG_RESULT, REG_ITMP1_XPTR);
 
-                       M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
-                       M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
-#else
-                       a = dseg_addaddress(&_exceptionptr);
-                       M_ALD(REG_ITMP3, REG_PV, a);
-                       M_ALD(REG_ITMP1_XPTR, REG_ITMP3, 0);
-                       M_AST(REG_ZERO, REG_ITMP3, 0);
-#endif
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       M_AADD_IMM(REG_SP, 1 * 8, REG_SP);
 
-                       a = dseg_addaddress(asm_handle_exception);
+                       a = dseg_addaddress(cd, asm_handle_exception);
                        M_ALD(REG_ITMP3, REG_PV, a);
                        M_JMP(REG_ITMP3);
                        M_NOP;
                }
        }
+#endif
 
-       /* generate null pointer check stubs */
 
-       xcodeptr = NULL;
+       /* generate exception and patcher stubs */
+
+       {
+               exceptionref *eref;
+               patchref     *pref;
+               u8            mcode;
+               s4           *savedmcodeptr;
+               s4           *tmpmcodeptr;
+
+               savedmcodeptr = NULL;
+
+               /* generate exception stubs */
+
+               for (eref = cd->exceptionrefs; eref != NULL; eref = eref->next) {
+                       gen_resolvebranch((u1 *) cd->mcodebase + eref->branchpos, 
+                                                         eref->branchpos,
+                                                         (u1 *) mcodeptr - cd->mcodebase);
+
+                       MCODECHECK(100);
+
+                       /* Check if the exception is an
+                          ArrayIndexOutOfBoundsException.  If so, move index register
+                          into REG_ITMP1. */
+
+                       if (eref->reg != -1)
+                               M_MOV(eref->reg, REG_ITMP1);
+
+                       /* calcuate exception address */
+
+                       M_LDA(REG_ITMP2_XPC, REG_PV, eref->branchpos - 4);
+
+                       /* move function to call into REG_ITMP3 */
+
+                       disp = dseg_addaddress(cd, eref->function);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
 
-       for (; xnullrefs != NULL; xnullrefs = xnullrefs->next) {
-               if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1*) mcodebase + xnullrefs->branchpos, 
-                                                         xnullrefs->branchpos,
-                                                         (u1*) xcodeptr - (u1*) mcodebase - 4);
-                       continue;
+                       if (savedmcodeptr != NULL) {
+                               M_BR(savedmcodeptr - mcodeptr);
+                               M_NOP;
+
+                       } else {
+                               savedmcodeptr = mcodeptr;
+
+                               M_MOV(REG_PV, rd->argintregs[0]);
+                               M_MOV(REG_SP, rd->argintregs[1]);
+
+                               if (m->isleafmethod)
+                                       M_MOV(REG_RA, rd->argintregs[2]);
+                               else
+                                       M_ALD(rd->argintregs[2],
+                                                 REG_SP, parentargs_base * 8 - SIZEOF_VOID_P);
+
+                               M_MOV(REG_ITMP2_XPC, rd->argintregs[3]);
+                               M_MOV(REG_ITMP1, rd->argintregs[4]);
+
+                               M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+                               M_AST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+                               if (m->isleafmethod)
+                                       M_AST(REG_RA, REG_SP, 1 * 8);
+
+                               M_JSR(REG_RA, REG_ITMP3);
+                               M_NOP;
+                               M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+
+                               if (m->isleafmethod)
+                                       M_ALD(REG_RA, REG_SP, 1 * 8);
+
+                               M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                               M_AADD_IMM(REG_SP, 2 * 8, REG_SP);
+
+                               a = dseg_addaddress(cd, asm_handle_exception);
+                               M_ALD(REG_ITMP3, REG_PV, a);
+                               M_JMP(REG_ITMP3);
+                               M_NOP;
+                       }
                }
 
-               gen_resolvebranch((u1*) mcodebase + xnullrefs->branchpos, 
-                                 xnullrefs->branchpos,
-                                                 (u1*) mcodeptr - mcodebase);
 
-               MCODECHECK(8);
+               /* generate code patching stub call code */
 
-               M_LADD_IMM(REG_PV, xnullrefs->branchpos - 4, REG_ITMP2_XPC);
+               for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
+                       /* check code segment size */
 
-               if (xcodeptr != NULL) {
-                       M_BR(xcodeptr - mcodeptr);
-                       M_NOP;
+                       MCODECHECK(100);
 
-               } else {
-                       xcodeptr = mcodeptr;
+                       /* Get machine code which is patched back in later. The
+                          call is 2 instruction words long. */
 
-                       M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
-                       M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+                       tmpmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
 
-                       a = dseg_addaddress(string_java_lang_NullPointerException);
-                       M_ALD(argintregs[0], REG_PV, a);
+                       /* We need to split this, because an unaligned 8 byte read
+                          causes a SIGSEGV. */
 
-                       a = dseg_addaddress(new_exception);
-                       M_ALD(REG_ITMP3, REG_PV, a);
-                       M_JSR(REG_RA, REG_ITMP3);
+                       mcode = ((u8) tmpmcodeptr[1] << 32) + (u4) tmpmcodeptr[0];
+
+                       /* Patch in the call to call the following code (done at
+                          compile time). */
+
+                       savedmcodeptr = mcodeptr;       /* save current mcodeptr          */
+                       mcodeptr      = tmpmcodeptr;    /* set mcodeptr to patch position */
+
+                       disp = (s4) (savedmcodeptr - (tmpmcodeptr + 1));
+
+                       if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff)) {
+                               *exceptionptr =
+                                       new_internalerror("Jump offset is out of range: %d > +/-%d",
+                                                                         disp, 0x00007fff);
+                               return false;
+                       }
+
+                       M_BR(disp);
                        M_NOP;
-                       M_MOV(REG_RESULT, REG_ITMP1_XPTR);
 
-                       M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
-                       M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+                       mcodeptr = savedmcodeptr;       /* restore the current mcodeptr   */
 
-                       a = dseg_addaddress(asm_handle_exception);
-                       M_ALD(REG_ITMP3, REG_PV, a);
+                       /* create stack frame */
+
+                       M_ASUB_IMM(REG_SP, 6 * 8, REG_SP);
+
+                       /* calculate return address and move it onto the stack */
+
+                       M_LDA(REG_ITMP3, REG_PV, pref->branchpos);
+                       M_AST(REG_ITMP3, REG_SP, 5 * 8);
+
+                       /* move pointer to java_objectheader onto stack */
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                       /* create a virtual java_objectheader */
+
+                       (void) dseg_addaddress(cd, get_dummyLR());          /* monitorPtr */
+                       disp = dseg_addaddress(cd, NULL);                   /* vftbl      */
+
+                       M_LDA(REG_ITMP3, REG_PV, disp);
+                       M_AST(REG_ITMP3, REG_SP, 4 * 8);
+#else
+                       /* do nothing */
+#endif
+
+                       /* move machine code onto stack */
+
+                       disp = dseg_adds8(cd, mcode);
+                       M_LLD(REG_ITMP3, REG_PV, disp);
+                       M_LST(REG_ITMP3, REG_SP, 3 * 8);
+
+                       /* move class/method/field reference onto stack */
+
+                       disp = dseg_addaddress(cd, pref->ref);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 8);
+
+                       /* move data segment displacement onto stack */
+
+                       disp = dseg_adds4(cd, pref->disp);
+                       M_ILD(REG_ITMP3, REG_PV, disp);
+                       M_IST(REG_ITMP3, REG_SP, 1 * 8);
+
+                       /* move patcher function pointer onto stack */
+
+                       disp = dseg_addaddress(cd, pref->patcher);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_AST(REG_ITMP3, REG_SP, 0 * 8);
+
+                       disp = dseg_addaddress(cd, asm_wrapper_patcher);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
                        M_JMP(REG_ITMP3);
                        M_NOP;
                }
+
+               /* generate replacement-out stubs */
+
+               {
+                       int i;
+
+                       replacementpoint = cd->code->rplpoints;
+                       for (i=0; i<cd->code->rplpointcount; ++i, ++replacementpoint) {
+                               /* check code segment size */
+
+                               MCODECHECK(100);
+
+                               /* note start of stub code */
+
+                               replacementpoint->outcode = (u1*) (ptrint)((u1*)mcodeptr - cd->mcodebase);
+
+                               /* make machine code for patching */
+
+                               tmpmcodeptr = mcodeptr;
+                               mcodeptr = (s4*) &(replacementpoint->mcode);
+
+                               disp = (ptrint)((s4*)replacementpoint->outcode - (s4*)replacementpoint->pc) - 1;
+                               if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff)) {
+                                       *exceptionptr =
+                                               new_internalerror("Jump offset is out of range: %d > +/-%d",
+                                                               disp, 0x00007fff);
+                                       return false;
+                               }
+                               M_BR(disp);
+                               M_NOP; /* delay slot */
+
+                               mcodeptr = tmpmcodeptr;
+
+                               /* create stack frame - 16-byte aligned */
+
+                               M_ASUB_IMM(REG_SP, 2 * 8, REG_SP);
+
+                               /* push address of `rplpoint` struct */
+
+                               disp = dseg_addaddress(cd, replacementpoint);
+                               M_ALD(REG_ITMP3, REG_PV, disp);
+                               M_AST(REG_ITMP3, REG_SP, 0 * 8);
+
+                               /* jump to replacement function */
+
+                               disp = dseg_addaddress(cd, asm_replacement_out);
+                               M_ALD(REG_ITMP3, REG_PV, disp);
+                               M_JMP(REG_ITMP3);
+                               M_NOP; /* delay slot */
+                       }
+               }
        }
-       }
 
-       codegen_finish((int)((u1*) mcodeptr - mcodebase));
+       codegen_finish(m, cd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
+
+       docacheflush((void *) cd->code->entrypoint, ((u1 *) mcodeptr - cd->mcodebase));
 
-       docacheflush((void*) method->entrypoint,
-                         ((u1*) mcodeptr - mcodebase));
+       /* everything's ok */
+
+       return true;
 }
 
 
-/* function createcompilerstub *************************************************
+/* createcompilerstub **********************************************************
 
-       creates a stub routine which calls the compiler
+   Creates a stub routine which calls the compiler.
        
 *******************************************************************************/
 
-#define COMPSTUBSIZE 4
+#define COMPILERSTUB_DATASIZE    2 * SIZEOF_VOID_P
+#define COMPILERSTUB_CODESIZE    4 * 4
+
+#define COMPILERSTUB_SIZE        COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
+
 
 u1 *createcompilerstub(methodinfo *m)
 {
-       u8 *s = CNEW(u8, COMPSTUBSIZE);     /* memory to hold the stub            */
-       s4 *mcodeptr = (s4 *) s;            /* code generation pointer            */
+       u1     *s;                          /* memory to hold the stub            */
+       ptrint *d;
+       s4     *mcodeptr;                   /* code generation pointer            */
+
+       s = CNEW(u1, COMPILERSTUB_SIZE);
+
+       /* set data pointer and code pointer */
+
+       d = (ptrint *) s;
+       s = s + COMPILERSTUB_DATASIZE;
+
+       mcodeptr = (s4 *) s;
        
-                                           /* code for the stub                  */
-       M_ALD(REG_PV, REG_PV, 24);          /* load pointer to the compiler       */
-       M_NOP;
-       M_JSR(REG_ITMP1, REG_PV);           /* jump to the compiler, return address
-                                              in itmp1 is used as method pointer */
-       M_NOP;
+       /* Store the methodinfo* in the same place as in the methodheader
+          for compiled methods. */
+
+       d[0] = (ptrint) asm_call_jit_compiler;
+       d[1] = (ptrint) m;
 
-       s[2] = (u8) m;                      /* literals to be adressed            */
-       s[3] = (u8) asm_call_jit_compiler;  /* jump directly via PV from above    */
+       M_ALD_INTERN(REG_ITMP1, REG_PV, -1 * SIZEOF_VOID_P);    /* method pointer */
+       M_ALD_INTERN(REG_PV, REG_PV, -2 * SIZEOF_VOID_P);  /* pointer to compiler */
+       M_JMP(REG_PV);
+       M_NOP;
 
-       (void) docacheflush((void*) s, (char*) mcodeptr - (char*) s);
+       (void) docacheflush((void *) s, (char *) mcodeptr - (char *) s);
 
-#ifdef STATISTICS
-       count_cstub_len += COMPSTUBSIZE * 8;
+#if defined(ENABLE_STATISTICS)
+       if (opt_stat)
+               count_cstub_len += COMPILERSTUB_SIZE;
 #endif
 
-       return (u1 *) s;
+       return s;
 }
 
 
-/* function removecompilerstub *************************************************
+/* createnativestub ************************************************************
 
-     deletes a compilerstub from memory  (simply by freeing it)
+   Creates a stub routine which calls a native method.
 
 *******************************************************************************/
 
-void removecompilerstub(u1 *stub)
+u1 *createnativestub(functionptr f, methodinfo *m, codegendata *cd,
+                                        registerdata *rd, methoddesc *nmd)
 {
-       CFREE(stub, COMPSTUBSIZE * 8);
-}
+       s4         *mcodeptr;               /* code generation pointer            */
+       s4          stackframesize;         /* size of stackframe if needed       */
+       methoddesc *md;
+       s4          nativeparams;
+       s4          i, j;                   /* count variables                    */
+       s4          t;
+       s4          s1, s2, disp;
+       s4          funcdisp;               /* displacement of the function       */
 
 
-/* function: createnativestub **************************************************
+       /* initialize variables */
 
-       creates a stub routine which calls a native method
+       md = m->parseddesc;
+       nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
 
-*******************************************************************************/
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#define NATIVESTUBSTACK       2
-#define NATIVESTUBTHREADEXTRA 5
-#else
-#define NATIVESTUBSTACK       1
-#define NATIVESTUBTHREADEXTRA 1
-#endif
+       /* calculate stack frame size */
 
-#define NATIVESTUBSIZE      (54 + 4 + NATIVESTUBTHREADEXTRA - 1)
-#define NATIVEVERBOSESIZE   (50 + 17)
-#define NATIVESTUBOFFSET    9
+       stackframesize =
+               1 +                             /* return address                     */
+               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(localref_table) / SIZEOF_VOID_P +
+               md->paramcount +                /* for saving arguments over calls    */
+               1 +                             /* for saving return address          */
+               nmd->memuse;
 
-u1 *createnativestub(functionptr f, methodinfo *m)
-{
-       u8 *s;                              /* memory to hold the stub            */
-       u8 *cs;
-       s4 *mcodeptr;                       /* code generation pointer            */
-       s4 stackframesize = 0;              /* size of stackframe if needed       */
-       s4 disp;
-       s4 stubsize;
-
-       reg_init();
-       descriptor2types(m);                /* set paramcount and paramtypes      */
-
-       stubsize = runverbose ? NATIVESTUBSIZE + NATIVEVERBOSESIZE : NATIVESTUBSIZE;
-       s = CNEW(u8, stubsize);             /* memory to hold the stub            */
-       cs = s + NATIVESTUBOFFSET;
-       mcodeptr = (s4 *) (cs);             /* code generation pointer            */
-
-       *(cs-1) = (u8) f;                   /* address of native method           */
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       *(cs-2) = (u8) &builtin_get_exceptionptrptr;
-#else
-       *(cs-2) = (u8) (&_exceptionptr);    /* address of exceptionptr            */
+
+       /* create method header */
+
+#if SIZEOF_VOID_P == 4
+       (void) dseg_addaddress(cd, m);                          /* MethodPointer  */
 #endif
-       *(cs-3) = (u8) asm_handle_nat_exception;/* addr of asm exception handler  */
-       *(cs-4) = (u8) (&env);              /* addr of jni_environement           */
-       *(cs-5) = (u8) builtin_trace_args;
-       *(cs-6) = (u8) m;
-       *(cs-7) = (u8) builtin_displaymethodstop;
-       *(cs-8) = (u8) m->class;
-       *(cs-9) = (u8) asm_check_clinit;
+       (void) dseg_addaddress(cd, m);                          /* MethodPointer  */
+       (void) dseg_adds4(cd, stackframesize * 8);              /* FrameSize      */
+       (void) dseg_adds4(cd, 0);                               /* IsSync         */
+       (void) dseg_adds4(cd, 0);                               /* IsLeaf         */
+       (void) dseg_adds4(cd, 0);                               /* IntSave        */
+       (void) dseg_adds4(cd, 0);                               /* FltSave        */
+       (void) dseg_addlinenumbertablesize(cd);
+       (void) dseg_adds4(cd, 0);                               /* ExTableSize    */
 
-       M_LDA(REG_SP, REG_SP, -NATIVESTUBSTACK * 8); /* build up stackframe       */
-       M_LST(REG_RA, REG_SP, 0);           /* store return address               */
 
-       /* if function is static, check for initialized */
+       /* initialize mcode variables */
+       
+       mcodeptr = (s4 *) cd->mcodeptr;
 
-       if (m->flags & ACC_STATIC) {
-       /* if class isn't yet initialized, do it */
-               if (!m->class->initialized) {
-                       /* call helper function which patches this code */
-                       M_ALD(REG_ITMP1, REG_PV, -8 * 8);     /* class                    */
-                       M_ALD(REG_ITMP3, REG_PV, -9 * 8);     /* asm_check_clinit         */
-                       M_JSR(REG_RA, REG_ITMP3);
-                       M_NOP;
-               }
-       }
 
-       /* max. 50 instructions */
-       if (runverbose) {
-               int p;
-               int t;
+       /* generate stub code */
 
-               M_LDA(REG_SP, REG_SP, -(18 * 8));
-               M_AST(REG_RA, REG_SP, 1 * 8);
+       M_LDA(REG_SP, REG_SP, -stackframesize * 8); /* build up stackframe        */
+       M_AST(REG_RA, REG_SP, stackframesize * 8 - SIZEOF_VOID_P); /* store ra    */
+
+
+       /* call trace function */
+
+       if (opt_verbosecall) {
+               M_LDA(REG_SP, REG_SP, -(1 + INT_ARG_CNT + FLT_ARG_CNT) * 8);
 
                /* save integer argument registers */
-               for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
-                       M_LST(argintregs[p], REG_SP,  (2 + p) * 8);
-               }
+
+               for (i = 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, (1 + i) * 8);
 
                /* save and copy float arguments into integer registers */
-               for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
-                       t = m->paramtypes[p];
+
+               for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
+                       t = md->paramtypes[i].type;
 
                        if (IS_FLT_DBL_TYPE(t)) {
                                if (IS_2_WORD_TYPE(t)) {
-                                       M_DST(argfltregs[p], REG_SP, (10 + p) * 8);
-                                       M_LLD(argintregs[p], REG_SP, (10 + p) * 8);
-
+                                       M_DST(rd->argfltregs[i], REG_SP, (1 + INT_ARG_CNT + i) * 8);
+                                       M_LLD(rd->argintregs[i], REG_SP, (1 + INT_ARG_CNT + i) * 8);
                                } else {
-                                       M_FST(argfltregs[p], REG_SP, (10 + p) * 8);
-                                       M_ILD(argintregs[p], REG_SP, (10 + p) * 8);
+                                       M_FST(rd->argfltregs[i], REG_SP, (1 + INT_ARG_CNT + i) * 8);
+                                       M_ILD(rd->argintregs[i], REG_SP, (1 + INT_ARG_CNT + i) * 8);
                                }
-
-                       } else {
-                               M_DST(argfltregs[p], REG_SP, (10 + p) * 8);
                        }
                }
 
-               M_ALD(REG_ITMP1, REG_PV, -6 * 8); /* method address                   */
-               M_AST(REG_ITMP1, REG_SP, 0);
-               M_ALD(REG_ITMP3, REG_PV, -5 * 8); /* builtin_trace_args               */
+               disp = dseg_addaddress(cd, m);
+               M_ALD(REG_ITMP1, REG_PV, disp);
+               M_AST(REG_ITMP1, REG_SP, 0 * 8);
+               disp = dseg_addaddress(cd, builtin_trace_args);
+               M_ALD(REG_ITMP3, REG_PV, disp);
                M_JSR(REG_RA, REG_ITMP3);
                M_NOP;
-               disp = -(int) (mcodeptr - (s4*) cs) * 4;
-               M_LDA(REG_PV, REG_RA, disp);
 
-               for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
-                       M_LLD(argintregs[p], REG_SP,  (2 + p) * 8);
-               }
+               for (i = 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, (1 + i) * 8);
 
-               for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
-                       t = m->paramtypes[p];
+               for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
+                       t = md->paramtypes[i].type;
 
                        if (IS_FLT_DBL_TYPE(t)) {
                                if (IS_2_WORD_TYPE(t)) {
-                                       M_DLD(argfltregs[p], REG_SP, (10 + p) * 8);
-
+                                       M_DLD(rd->argfltregs[i], REG_SP, (1 + INT_ARG_CNT + i) * 8);
                                } else {
-                                       M_FLD(argfltregs[p], REG_SP, (10 + p) * 8);
+                                       M_FLD(rd->argfltregs[i], REG_SP, (1 + INT_ARG_CNT + i) * 8);
                                }
-
-                       } else {
-                               M_DLD(argfltregs[p], REG_SP, (10 + p) * 8);
                        }
                }
 
-               M_ALD(REG_RA, REG_SP, 1 * 8);
-               M_LDA(REG_SP, REG_SP, 18 * 8);
+               M_LDA(REG_SP, REG_SP, (1 + INT_ARG_CNT + FLT_ARG_CNT) * 8);
        }
 
-       /* save argument registers on stack -- if we have to */
-       if ((m->flags & ACC_STATIC && m->paramcount > (INT_ARG_CNT - 2)) || m->paramcount > (INT_ARG_CNT - 1)) {
-               int i;
-               int paramshiftcnt = (m->flags & ACC_STATIC) ? 2 : 1;
-               int stackparamcnt = (m->paramcount > INT_ARG_CNT) ? m->paramcount - INT_ARG_CNT : 0;
 
-               stackframesize = stackparamcnt + paramshiftcnt;
+       /* get function address (this must happen before the stackframeinfo) */
+
+       funcdisp = dseg_addaddress(cd, f);
 
-               M_LDA(REG_SP, REG_SP, -stackframesize * 8);
+#if !defined(WITH_STATIC_CLASSPATH)
+       if (f == NULL) {
+               codegen_addpatchref(cd, mcodeptr, PATCHER_resolve_native, m, funcdisp);
 
-               /* copy stack arguments into new stack frame -- if any */
-               for (i = 0; i < stackparamcnt; i++) {
-                       M_LLD(REG_ITMP1, REG_SP, (stackparamcnt + 1 + i) * 8);
-                       M_LST(REG_ITMP1, REG_SP, (paramshiftcnt + i) * 8);
+               if (opt_showdisassemble) {
+                       M_NOP; M_NOP;
                }
+       }
+#endif
 
-               if (m->flags & ACC_STATIC) {
-                       if (IS_FLT_DBL_TYPE(m->paramtypes[5])) {
-                               M_DST(argfltregs[5], REG_SP, 1 * 8);
-                       } else {
-                               M_LST(argintregs[5], REG_SP, 1 * 8);
-                       }
+       /* save integer and float argument registers */
 
-                       if (IS_FLT_DBL_TYPE(m->paramtypes[4])) {
-                               M_DST(argfltregs[4], REG_SP, 0 * 8);
-                       } else {
-                               M_LST(argintregs[4], REG_SP, 0 * 8);
-                       }
+       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++;
+               }
+       }
 
-               } else {
-                       if (IS_FLT_DBL_TYPE(m->paramtypes[5])) {
-                               M_DST(argfltregs[5], REG_SP, 0 * 8);
-                       } else {
-                               M_LST(argintregs[5], REG_SP, 0 * 8);
-                       }
+       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++;
                }
        }
 
-       if (m->flags & ACC_STATIC) {
-               M_MOV(argintregs[5], argintregs[7]);
+       /* prepare data structures for native function call */
+
+       M_AADD_IMM(REG_SP, stackframesize * 8 - SIZEOF_VOID_P, rd->argintregs[0]);
+       M_MOV(REG_PV, rd->argintregs[1]);
+       M_AADD_IMM(REG_SP, stackframesize * 8, rd->argintregs[2]);
+       M_ALD(rd->argintregs[3], REG_SP, stackframesize * 8 - SIZEOF_VOID_P);
+       disp = dseg_addaddress(cd, codegen_start_native_call);
+       M_ALD(REG_ITMP3, REG_PV, disp);
+       M_JSR(REG_RA, REG_ITMP3);
+       M_NOP; /* XXX fill me! */
 
-               M_DMFC1(REG_ITMP1, argfltregs[5]);
-               M_DMTC1(REG_ITMP1, argfltregs[7]);
+       /* restore integer and float argument registers */
 
-               M_MOV(argintregs[4], argintregs[6]);
+       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++;
+               }
+       }
 
-               M_DMFC1(REG_ITMP1, argfltregs[4]);
-               M_DMTC1(REG_ITMP1, argfltregs[6]);
+       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++;
+               }
+       }
 
-               M_MOV(argintregs[3], argintregs[5]);
-               M_DMFC1(REG_ITMP1, argfltregs[3]);
+       /* copy or spill arguments to new locations */
 
-               M_MOV(argintregs[2], argintregs[4]);
-               M_DMTC1(REG_ITMP1, argfltregs[5]);
+       for (i = md->paramcount - 1, j = i + nativeparams; i >= 0; i--, j--) {
+               t = md->paramtypes[i].type;
 
-               M_MOV(argintregs[1], argintregs[3]);
-               M_DMFC1(REG_ITMP1, argfltregs[2]);
+               if (IS_INT_LNG_TYPE(t)) {
+                       if (!md->params[i].inmemory) {
+                               s1 = rd->argintregs[md->params[i].regoff];
 
-               M_MOV(argintregs[0], argintregs[2]);
-               M_DMTC1(REG_ITMP1, argfltregs[4]);
+                               if (!nmd->params[j].inmemory) {
+                                       s2 = rd->argintregs[nmd->params[j].regoff];
+                                       M_INTMOVE(s1, s2);
+                               } else {
+                                       s2 = nmd->params[j].regoff;
+                                       M_AST(s1, REG_SP, s2 * 8);
+                               }
 
-               M_DMFC1(REG_ITMP1, argfltregs[1]);
-               M_DMTC1(REG_ITMP1, argfltregs[3]);
+                       } else {
+                               s1 = md->params[i].regoff + stackframesize;
+                               s2 = nmd->params[j].regoff;
+                               M_ALD(REG_ITMP1, REG_SP, s1 * 8);
+                               M_AST(REG_ITMP1, REG_SP, s2 * 8);
+                       }
 
-               M_DMFC1(REG_ITMP1, argfltregs[0]);
-               M_DMTC1(REG_ITMP1, argfltregs[2]);
+               } else {
+                       if (!md->params[i].inmemory) {
+                               s1 = rd->argfltregs[md->params[i].regoff];
 
-               M_ALD(argintregs[1], REG_PV, -8 * 8);
+                               if (!nmd->params[j].inmemory) {
+                                       s2 = rd->argfltregs[nmd->params[j].regoff];
+                                       M_TFLTMOVE(t, s1, s2);
+                               } else {
+                                       s2 = nmd->params[j].regoff;
+                                       if (IS_2_WORD_TYPE(t))
+                                               M_DST(s1, REG_SP, s2 * 8);
+                                       else
+                                               M_FST(s1, REG_SP, s2 * 8);
+                               }
 
-       } else {
-               M_MOV(argintregs[6], argintregs[7]);
+                       } else {
+                               s1 = md->params[i].regoff + stackframesize;
+                               s2 = nmd->params[j].regoff;
+                               M_DLD(REG_FTMP1, REG_SP, s1 * 8);
+                               if (IS_2_WORD_TYPE(t))
+                                       M_DST(REG_FTMP1, REG_SP, s2 * 8);
+                               else
+                                       M_FST(REG_FTMP1, REG_SP, s2 * 8);
+                       }
+               }
+       }
 
-               M_DMFC1(REG_ITMP1, argfltregs[6]);
-               M_DMTC1(REG_ITMP1, argfltregs[7]);
+       /* put class into second argument register */
 
-               M_MOV(argintregs[5], argintregs[6]);
+       if (m->flags & ACC_STATIC) {
+               disp = dseg_addaddress(cd, m->class);
+               M_ALD(rd->argintregs[1], REG_PV, disp);
+       }
 
-               M_DMFC1(REG_ITMP1, argfltregs[5]);
-               M_DMTC1(REG_ITMP1, argfltregs[6]);
+       /* put env into first argument register */
 
-               M_MOV(argintregs[4], argintregs[5]);
-               M_DMFC1(REG_ITMP1, argfltregs[4]);
+       disp = dseg_addaddress(cd, _Jv_env);
+       M_ALD(rd->argintregs[0], REG_PV, disp);
 
-               M_MOV(argintregs[3], argintregs[4]);
-               M_DMTC1(REG_ITMP1, argfltregs[5]);
+       /* do the native function call */
 
-               M_MOV(argintregs[2], argintregs[3]);
-               M_DMFC1(REG_ITMP1, argfltregs[3]);
+       M_ALD(REG_ITMP3, REG_PV, funcdisp); /* load adress of native method       */
+       M_JSR(REG_RA, REG_ITMP3);           /* call native method                 */
+       M_NOP;                              /* delay slot                         */
 
-               M_MOV(argintregs[1], argintregs[2]);
-               M_DMTC1(REG_ITMP1, argfltregs[4]);
+       /* save return value */
 
-               M_MOV(argintregs[0], argintregs[1]);
-               M_DMFC1(REG_ITMP1, argfltregs[2]);
+       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);
 
-               M_DMTC1(REG_ITMP1, argfltregs[3]);
+       /* remove native stackframe info */
 
-               M_DMFC1(REG_ITMP1, argfltregs[1]);
-               M_DMFC1(REG_ITMP2, argfltregs[0]);
+       M_AADD_IMM(REG_SP, stackframesize * 8 - SIZEOF_VOID_P, rd->argintregs[0]);
+       disp = dseg_addaddress(cd, codegen_finish_native_call);
+       M_ALD(REG_ITMP3, REG_PV, disp);
+       M_JSR(REG_RA, REG_ITMP3);
+       M_NOP; /* XXX fill me! */
 
-               M_DMTC1(REG_ITMP1, argfltregs[2]);
-               M_DMTC1(REG_ITMP2, argfltregs[1]);
-       }
+       /* call finished trace function */
 
-       M_ALD(argintregs[0], REG_PV, -4 * 8); /* load adress of jni_environement  */
-       M_ALD(REG_ITMP3, REG_PV, -1 * 8);   /* load adress of native method       */
-       M_JSR(REG_RA, REG_ITMP3);           /* call native method                 */
-       M_NOP;                              /* delay slot                         */
+       if (opt_verbosecall) {
+               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);
 
-       /* remove stackframe if there is one */
-       if (stackframesize) {
-               M_LDA(REG_SP, REG_SP, stackframesize * 8);
-       }
+               disp = dseg_addaddress(cd, m);
+               M_ALD(rd->argintregs[0], REG_PV, disp);
 
-       /* 17 instructions */
-       if (runverbose) {
-               M_LDA(REG_SP, REG_SP, -(3 * 8));
-               M_AST(REG_RA, REG_SP, 0 * 8);
-               M_LST(REG_RESULT, REG_SP, 1 * 8);
-               M_DST(REG_FRESULT, REG_SP, 2 * 8);
-               M_ALD(argintregs[0], REG_PV, -6 * 8);
-               M_MOV(REG_RESULT, argintregs[1]);
+               M_MOV(REG_RESULT, rd->argintregs[1]);
                M_DMFC1(REG_ITMP1, REG_FRESULT);
-               M_DMTC1(REG_ITMP1, argfltregs[2]);
-               M_DMTC1(REG_ITMP1, argfltregs[3]);
-               M_ALD(REG_ITMP3, REG_PV, -7 * 8);/* builtin_displaymethodstop         */
+               M_DMTC1(REG_ITMP1, rd->argfltregs[2]);
+               M_DMTC1(REG_ITMP1, rd->argfltregs[3]);
+
+               disp = dseg_addaddress(cd, builtin_displaymethodstop);
+               M_ALD(REG_ITMP3, REG_PV, disp);
                M_JSR(REG_RA, REG_ITMP3);
                M_NOP;
-               disp = -(int) (mcodeptr - (s4*) cs) * 4;
-               M_LDA(REG_PV, REG_RA, disp);
-               M_ALD(REG_RA, REG_SP, 0 * 8);
-               M_LLD(REG_RESULT, REG_SP, 1 * 8);
-               M_DLD(REG_FRESULT, REG_SP, 2 * 8);
-               M_LDA(REG_SP, REG_SP, 3 * 8);
        }
 
+       /* check for exception */
+
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       M_ALD(REG_ITMP3, REG_PV, -2 * 8);   /* builtin_get_exceptionptrptr        */
+       disp = dseg_addaddress(cd, builtin_get_exceptionptrptr);
+       M_ALD(REG_ITMP3, REG_PV, disp);
        M_JSR(REG_RA, REG_ITMP3);
-
-       /* delay slot */
-       if (IS_FLT_DBL_TYPE(m->returntype))
-               M_DST(REG_FRESULT, REG_SP, 1 * 8);
-       else
-               M_AST(REG_RESULT, REG_SP, 1 * 8);
+       M_NOP;
        M_MOV(REG_RESULT, REG_ITMP3);
-       if (IS_FLT_DBL_TYPE(m->returntype))
-               M_DLD(REG_FRESULT, REG_SP, 1 * 8);
-       else
-               M_ALD(REG_RESULT, REG_SP, 1 * 8);
 #else
-       M_ALD(REG_ITMP3, REG_PV, -2 * 8);   /* get address of exceptionptr        */
+       disp = dseg_addaddress(cd, &_exceptionptr);
+       M_ALD(REG_ITMP3, REG_PV, disp);     /* get address of exceptionptr        */
 #endif
-
-       M_LLD(REG_RA, REG_SP, 0);           /* load return address                */
        M_ALD(REG_ITMP1, REG_ITMP3, 0);     /* load exception into reg. itmp1     */
 
+       M_ALD(REG_RA, REG_SP, stackframesize * 8 - SIZEOF_VOID_P); /* load ra     */
+
+       /* restore return value */
+
+       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);
+
        M_BNEZ(REG_ITMP1, 2);               /* if no exception then return        */
-       M_LDA(REG_SP, REG_SP, NATIVESTUBSTACK * 8);/*remove stackframe, delay slot*/
+       M_LDA(REG_SP, REG_SP, stackframesize * 8);/* remove stackframe, DELAY SLOT*/
 
        M_RET(REG_RA);                      /* return to caller                   */
-       M_NOP;                              /* delay slot                         */
+       M_NOP;                              /* DELAY SLOT                         */
+
+       /* handle exception */
        
        M_AST(REG_ZERO, REG_ITMP3, 0);      /* store NULL into exceptionptr       */
-       M_ALD(REG_ITMP3, REG_PV, -3 * 8);   /* load asm exception handler address */
 
+       disp = dseg_addaddress(cd, asm_handle_nat_exception);
+       M_ALD(REG_ITMP3, REG_PV, disp);     /* load asm exception handler address */
        M_JMP(REG_ITMP3);                   /* jump to asm exception handler      */
        M_LDA(REG_ITMP2, REG_RA, -4);       /* move fault address into reg. itmp2 */
-                                           /* delay slot                         */
+                                           /* DELAY SLOT                         */
 
-       (void) docacheflush((void*) cs, (char*) mcodeptr - (char*) cs);
+       /* generate static stub call code                                         */
 
-#if 0
-       dolog_plain("stubsize: %d (for %d params)\n", 
-                               (int) (mcodeptr - (s4*) s), m->paramcount);
-#endif
+       {
+               patchref *pref;
+               u8        mcode;
+               s4       *savedmcodeptr;
+               s4       *tmpmcodeptr;
+
+               for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
+                       /* Get machine code which is patched back in later. The
+                          call is 2 instruction words long. */
+
+                       tmpmcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
+
+                       /* We need to split this, because an unaligned 8 byte read
+                          causes a SIGSEGV. */
+
+                       mcode = ((u8) tmpmcodeptr[1] << 32) + (u4) tmpmcodeptr[0];
+
+                       /* Patch in the call to call the following code (done at
+                          compile time). */
+
+                       savedmcodeptr = mcodeptr;       /* save current mcodeptr          */
+                       mcodeptr      = tmpmcodeptr;    /* set mcodeptr to patch position */
+
+                       M_BRS(savedmcodeptr - (tmpmcodeptr + 1));
+                       M_NOP;                          /* branch delay slot              */
+
+                       mcodeptr = savedmcodeptr;       /* restore the current mcodeptr   */
+
+                       /* create stack frame                                             */
+
+                       M_LSUB_IMM(REG_SP, 6 * 8, REG_SP);
+
+                       /* move return address onto stack */
+
+                       M_AST(REG_RA, REG_SP, 5 * 8);
+
+                       /* move pointer to java_objectheader onto stack */
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                       /* order reversed because of data segment layout */
 
-#ifdef STATISTICS
-       count_nstub_len += NATIVESTUBSIZE * 8;
+                       (void) dseg_addaddress(cd, get_dummyLR());          /* monitorPtr */
+                       disp = dseg_addaddress(cd, NULL);                   /* vftbl      */
+
+                       M_LDA(REG_ITMP3, REG_PV, disp);
+                       M_AST(REG_ITMP3, REG_SP, 4 * 8);
+#else
+                       M_AST(REG_ZERO, REG_SP, 4 * 8);
 #endif
 
-       return (u1 *) (s + NATIVESTUBOFFSET);
-}
+                       /* move machine code onto stack */
 
+                       disp = dseg_adds8(cd, mcode);
+                       M_LLD(REG_ITMP3, REG_PV, disp);
+                       M_LST(REG_ITMP3, REG_SP, 3 * 8);
 
-/* function: removenativestub **************************************************
+                       /* move class/method/field reference onto stack */
 
-    removes a previously created native-stub from memory
-    
-*******************************************************************************/
+                       disp = dseg_addaddress(cd, pref->ref);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 8);
 
-void removenativestub(u1 *stub)
-{
-       CFREE((u8*) stub - NATIVESTUBOFFSET, NATIVESTUBSIZE * 8);
-}
+                       /* move data segment displacement onto stack */
 
+                       disp = dseg_adds4(cd, pref->disp);
+                       M_ILD(REG_ITMP3, REG_PV, disp);
+                       M_IST(REG_ITMP3, REG_SP, 1 * 8);
 
-void docacheflush(u1 *p, long bytelen)
-{
-       u1 *e = p + bytelen;
-       long psize = sysconf(_SC_PAGESIZE);
-       p -= (long) p & (psize-1);
-       e += psize - ((((long) e - 1) & (psize-1)) + 1);
-       bytelen = e-p;
-       mprotect(p, bytelen, PROT_READ|PROT_WRITE|PROT_EXEC);
+                       /* move patcher function pointer onto stack */
+
+                       disp = dseg_addaddress(cd, pref->patcher);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_AST(REG_ITMP3, REG_SP, 0 * 8);
+
+                       disp = dseg_addaddress(cd, asm_wrapper_patcher);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_JMP(REG_ITMP3);
+                       M_NOP;
+               }
+       }
+
+       codegen_finish(m, cd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
+
+       docacheflush((void *) cd->code->entrypoint, ((u1 *) mcodeptr - cd->mcodebase));
+
+       return cd->code->entrypoint;
 }
 
 
@@ -4187,4 +4645,5 @@ void docacheflush(u1 *p, long bytelen)
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */