* src/vm/jit/powerpc/codegen.c, src/vm/jit/alpha/codegen.c,
[cacao.git] / src / vm / jit / i386 / codegen.c
index 6cbc8efdbedc520174d6f90fd2a7390e0cd2c8e0..955d3bb8a4770f9054e37e85ad0a03466ebafb6e 100644 (file)
@@ -1,10 +1,9 @@
-/* jit/i386/codegen.c - machine code generator for i386
+/* src/vm/jit/i386/codegen.c - machine code generator for i386
 
-   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
             Christian Thalinger
 
-   $Id: codegen.c 930 2004-03-02 21:18:23Z jowenn $
+   Changes: Joseph Wenninger
+            Christian Ullrich
 
-*/
-
-
-#include <stdio.h>
-#include <signal.h>
-#include "types.h"
-#include "main.h"
-#include "parse.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 "methodtable.h"
-#include "offsets.h"
-
-/* include independent code generation stuff */
-#include "codegen.inc"
-#include "reg.inc"
-
-
-/* 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 */
-
-/* 
-   we initially try to use %edx as scratch register, it cannot be used if we
-   have one of these ICMDs:
-   LMUL, LMULCONST, IDIV, IREM, LALOAD, AASTORE, LASTORE, IASTORE, CASTORE,
-   SASTORE, BASTORE, INSTANCEOF, CHECKCAST, I2L, F2L, D2L
-*/
-int nregdescint[] = {
-    REG_RET, REG_TMP, REG_TMP, REG_TMP, REG_RES, REG_SAV, REG_SAV, REG_SAV,
-    REG_END
-};
-
-
-int nregdescfloat[] = {
-  /* rounding problems with callee saved registers */
-/*      REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_TMP, REG_TMP, REG_RES, REG_RES, */
-/*      REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_RES, REG_RES, */
-    REG_RES, REG_RES, REG_RES, REG_RES, REG_RES, REG_RES, REG_RES, REG_RES,
-    REG_END
-};
-
-
-/* additional functions and macros to generate code ***************************/
-
-#define BlockPtrOfPC(pc)  ((basicblock *) iptr->target)
-
-
-#ifdef STATISTICS
-#define COUNT_SPILLS count_spills++
-#else
-#define COUNT_SPILLS
-#endif
-
-
-#define CALCOFFSETBYTES(var, reg, val) \
-    if ((s4) (val) < -128 || (s4) (val) > 127) (var) += 4; \
-    else if ((s4) (val) != 0) (var) += 1; \
-    else if ((reg) == EBP) (var) += 1;
-
-
-#define CALCIMMEDIATEBYTES(var, val) \
-    if ((s4) (val) < -128 || (s4) (val) > 127) (var) += 4; \
-    else (var) += 1;
-
-
-/* gen_nullptr_check(objreg) */
-
-#define gen_nullptr_check(objreg) \
-       if (checknull) { \
-        i386_test_reg_reg((objreg), (objreg)); \
-        i386_jcc(I386_CC_E, 0); \
-           codegen_addxnullrefs(mcodeptr); \
-       }
-
-
-/* MCODECHECK(icnt) */
-
-#define MCODECHECK(icnt) \
-       if ((mcodeptr + (icnt)) > (u1*) mcodeend) mcodeptr = (u1*) 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(reg,dreg) if ((reg) != (dreg)) { i386_mov_reg_reg((reg),(dreg)); }
-
-
-/* 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(reg,dreg) panic("M_FLTMOVE");
-
-#define M_LNGMEMMOVE(reg,dreg) \
-    do { \
-        i386_mov_membase_reg(REG_SP, (reg) * 8, REG_ITMP1); \
-        i386_mov_reg_membase(REG_ITMP1, REG_SP, (dreg) * 8); \
-        i386_mov_membase_reg(REG_SP, (reg) * 8 + 4, REG_ITMP1); \
-        i386_mov_reg_membase(REG_ITMP1, REG_SP, (dreg) * 8 + 4); \
-    } while (0)
+   $Id: codegen.c 4393 2006-01-31 15:41:22Z twisti $
 
-
-/* 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; \
-        i386_mov_membase_reg(REG_SP, (v)->regoff * 8, tempnr); \
-        regnr = tempnr; \
-    } else { \
-        regnr = (v)->regoff; \
-    }
-
-
-
-#define var_to_reg_flt(regnr,v,tempnr) \
-    if ((v)->type == TYPE_FLT) { \
-        if ((v)->flags & INMEMORY) { \
-            COUNT_SPILLS; \
-            i386_flds_membase(REG_SP, (v)->regoff * 8); \
-            fpu_st_offset++; \
-            regnr = tempnr; \
-        } else { \
-            i386_fld_reg((v)->regoff + fpu_st_offset); \
-            fpu_st_offset++; \
-            regnr = (v)->regoff; \
-        } \
-    } else { \
-        if ((v)->flags & INMEMORY) { \
-            COUNT_SPILLS; \
-            i386_fldl_membase(REG_SP, (v)->regoff * 8); \
-            fpu_st_offset++; \
-            regnr = tempnr; \
-        } else { \
-            i386_fld_reg((v)->regoff + fpu_st_offset); \
-            fpu_st_offset++; \
-            regnr = (v)->regoff; \
-        } \
-    }
-
-#define NEW_var_to_reg_flt(regnr,v,tempnr) \
-    if ((v)->type == TYPE_FLT) { \
-       if ((v)->flags & INMEMORY) { \
-            COUNT_SPILLS; \
-            i386_flds_membase(REG_SP, (v)->regoff * 8); \
-            fpu_st_offset++; \
-            regnr = tempnr; \
-        } else { \
-            regnr = (v)->regoff; \
-        } \
-    } else { \
-        if ((v)->flags & INMEMORY) { \
-            COUNT_SPILLS; \
-            i386_fldl_membase(REG_SP, (v)->regoff * 8); \
-            fpu_st_offset++; \
-            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; \
-        i386_mov_reg_membase(tempregnum, REG_SP, (sptr)->regoff * 8); \
-    }
-
-
-#define store_reg_to_var_flt(sptr, tempregnum) \
-    if ((sptr)->type == TYPE_FLT) { \
-        if ((sptr)->flags & INMEMORY) { \
-             COUNT_SPILLS; \
-             i386_fstps_membase(REG_SP, (sptr)->regoff * 8); \
-             fpu_st_offset--; \
-        } else { \
-/*                  i386_fxch_reg((sptr)->regoff);*/ \
-             i386_fstp_reg((sptr)->regoff + fpu_st_offset); \
-             fpu_st_offset--; \
-        } \
-    } else { \
-        if ((sptr)->flags & INMEMORY) { \
-            COUNT_SPILLS; \
-            i386_fstpl_membase(REG_SP, (sptr)->regoff * 8); \
-            fpu_st_offset--; \
-        } else { \
-/*                  i386_fxch_reg((sptr)->regoff);*/ \
-            i386_fstp_reg((sptr)->regoff + fpu_st_offset); \
-            fpu_st_offset--; \
-        } \
-    }
-
-
-/* NullPointerException signal handler for hardware null pointer check */
-
-void catch_NullPointerException(int sig)
-{
-       sigset_t nsig;
-/*     long     faultaddr; */
-
-       void **_p = (void **) &sig;
-       struct sigcontext *sigctx = (struct sigcontext *) ++_p;
 
-       /* Reset signal handler - necessary for SysV, does no harm for BSD */
+#include "config.h"
 
-/*     instr = *((int*)(sigctx->eip)); */
-/*     faultaddr = sigctx->sc_regs[(instr >> 16) & 0x1f]; */
-
-/*     fprintf(stderr, "null=%d %p addr=%p\n", sig, sigctx, sigctx->eip); */
-
-/*     if (faultaddr == 0) { */
-               signal(sig, (void *) catch_NullPointerException);          /* reinstall handler */
-               sigemptyset(&nsig);
-               sigaddset(&nsig, sig);
-               sigprocmask(SIG_UNBLOCK, &nsig, NULL);                     /* unblock signal    */
-               sigctx->eax = (long) proto_java_lang_NullPointerException; /* REG_ITMP1_XPTR    */
-               sigctx->ecx = sigctx->eip;                                 /* REG_ITMP2_XPC     */
-               sigctx->eip = (long) asm_handle_exception;
-
-               return;
-
-/*     } else { */
-/*             faultaddr += (long) ((instr << 16) >> 16); */
-/*             fprintf(stderr, "faulting address: 0x%08x\n", faultaddr); */
-/*             panic("Stack overflow"); */
-/*     } */
-}
-
-
-/* ArithmeticException signal handler for hardware divide by zero check */
-
-void catch_ArithmeticException(int sig)
-{
-       sigset_t nsig;
-
-       void **_p = (void **) &sig;
-       struct sigcontext *sigctx = (struct sigcontext *) ++_p;
-
-       classinfo *c;
-       java_objectheader *p;
-       methodinfo *m;
-
-       /* Reset signal handler - necessary for SysV, does no harm for BSD        */
-
-       signal(sig, (void *) catch_ArithmeticException);     /* reinstall handler */
-       sigemptyset(&nsig);
-       sigaddset(&nsig, sig);
-       sigprocmask(SIG_UNBLOCK, &nsig, NULL);               /* unblock signal    */
-
-       c = loader_load_sysclass(NULL,utf_new_char("java/lang/ArithmeticException"));
-       p = builtin_new(c);
-       m = class_findmethod(c, 
-                                                utf_new_char("<init>"), 
-                                                utf_new_char("(Ljava/lang/String;)V"));
-
-       asm_calljavafunction(m, p, javastring_new_char("/ by zero"), NULL, NULL);
-
-       sigctx->eax = (long) p;                              /* REG_ITMP1_XPTR    */
-       sigctx->ecx = sigctx->eip;                           /* REG_ITMP2_XPC     */
-       sigctx->eip = (long) asm_handle_exception;
-
-       return;
-}
-
-
-void init_exceptions(void)
-{
-       /* install signal handlers we need to convert to exceptions */
-
-       if (!checknull) {
-
-#if defined(SIGSEGV)
-               signal(SIGSEGV, (void *) catch_NullPointerException);
-#endif
+#include <assert.h>
+#include <stdio.h>
 
-#if defined(SIGBUS)
-               signal(SIGBUS, (void *) catch_NullPointerException);
+#include "vm/types.h"
+
+#include "vm/jit/i386/md-abi.h"
+
+#include "vm/jit/i386/codegen.h"
+#include "vm/jit/i386/emitfuncs.h"
+
+#include "cacao/cacao.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/stringlocal.h"
+#include "vm/utf8.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/parse.h"
+#include "vm/jit/patcher.h"
+#include "vm/jit/reg.h"
+
+#if defined(ENABLE_LSRA)
+# ifdef LSRA_USES_REG_RES
+#  include "vm/jit/i386/icmd_uses_reg_res.inc"
+# endif
+# include "vm/jit/allocator/lsra.h"
 #endif
-       }
-
-       signal(SIGFPE, (void *) catch_ArithmeticException);
-}
 
 
-/* function gen_mcode **********************************************************
+/* codegen *********************************************************************
 
-       generates machine code
+   Generates machine code.
 
 *******************************************************************************/
 
-/* global code generation pointer */
-u1 *mcodeptr;
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-static void *castlockptr = cast_lock;
-#endif
-
-void codegen()
+bool codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 {
-       int  len, s1, s2, s3, d;
-       s4   a;
-       stackptr    src;
-       varinfo     *var;
-       basicblock  *bptr;
-       instruction *iptr;
-
-       int fpu_st_offset = 0;
-
-       xtable *ex;
+       s4                  len, s1, s2, s3, d, off, disp;
+       s4                  parentargs_base;
+       stackptr            src;
+       varinfo            *var;
+       basicblock         *bptr;
+       instruction        *iptr;
+       exceptiontable     *ex;
+       u2                  currentline;
+       methodinfo         *lm;             /* local methodinfo for ICMD_INVOKE*  */
+       builtintable_entry *bte;
+       methoddesc         *md;
+       s4                  fpu_st_offset = 0;
+
+       /* prevent compiler warnings */
+
+       d = 0;
+       currentline = 0;
+       lm = NULL;
+       bte = NULL;
 
        {
-       int p, pa, t, l, r;
-
-       savedregs_num = 0;
+       s4 i, p, t, l;
+       s4 savedregs_num = 0;
+       s4 stack_off = 0;
 
        /* space to save used callee saved registers */
 
-       savedregs_num += (savintregcnt - maxsavintreguse);
-       savedregs_num += (savfltregcnt - maxsavfltreguse);
+       savedregs_num += (INT_SAV_CNT - rd->savintreguse);
 
-       parentargs_base = maxmemuse + savedregs_num;
+       /* float register are saved on 2 4-byte stackslots */
+       savedregs_num += (FLT_SAV_CNT - rd->savfltreguse) * 2;
 
-#ifdef USE_THREADS                 /* space to save argument of monitor_enter */
+       parentargs_base = rd->memuse + savedregs_num;
 
-       if (checksync && (method->flags & ACC_SYNCHRONIZED))
-               parentargs_base++;
+          
+#if defined(USE_THREADS)
+       /* space to save argument of monitor_enter */
 
-#endif
+       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+               /* reserve 2 slots for long/double return values for monitorexit */
 
-       /* create method header */
+               if (IS_2_WORD_TYPE(m->parseddesc->returntype.type))
+                       parentargs_base += 2;
+               else
+                       parentargs_base++;
+       }
+#endif
 
-       (void) dseg_addaddress(method);                         /* MethodPointer  */
-       (void) dseg_adds4(parentargs_base * 8);                 /* FrameSize      */
+/* create method header */
 
-#ifdef USE_THREADS
+       (void) dseg_addaddress(cd, m);                          /* MethodPointer  */
+       (void) dseg_adds4(cd, parentargs_base * 4);             /* 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) * 4);        /* 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        */
+
+       /* adds a reference for the length of the line number counter. We don't
+          know the size yet, since we evaluate the information during code
+          generation, to save one additional iteration over the whole
+          instructions. During code optimization the position could have changed
+          to the information gotten from the class file */
+       (void) dseg_addlinenumbertablesize(cd);
+
+       (void) dseg_adds4(cd, cd->exceptiontablelength);        /* ExTableSize    */
+       
        /* create exception table */
 
-       for (ex = extable; ex != NULL; ex = ex->down) {
-
-#ifdef LOOP_DEBUG      
-               if (ex->start != NULL)
-                       printf("adding start - %d - ", ex->start->debug_nr);
-               else {
-                       printf("PANIC - start is NULL");
-                       exit(-1);
-               }
-#endif
-
-               dseg_addtarget(ex->start);
-
-#ifdef LOOP_DEBUG                      
-               if (ex->end != NULL)
-                       printf("adding end - %d - ", ex->end->debug_nr);
-               else {
-                       printf("PANIC - end is NULL");
-                       exit(-1);
-               }
-#endif
-
-               dseg_addtarget(ex->end);
-
-#ifdef LOOP_DEBUG              
-               if (ex->handler != NULL)
-                       printf("adding handler - %d\n", ex->handler->debug_nr);
-               else {
-                       printf("PANIC - handler is NULL");
-                       exit(-1);
-               }
-#endif
-
-               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 = (u1*) mcodebase;
-       mcodeend = (s4*) (mcodebase + mcodesize);
-       MCODECHECK(128 + mparamcount);
+       cd->mcodeptr = cd->mcodebase;
+       cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
 
-       /* create stack frame (if necessary) */
+       /* initialize the last patcher pointer */
 
-       if (parentargs_base) {
-               i386_alu_imm_reg(I386_SUB, parentargs_base * 8, REG_SP);
-       }
+       cd->lastmcodeptr = cd->mcodeptr;
 
-       /* save return address and used callee saved registers */
+       /* generate profiling code */
 
-       p = parentargs_base;
-       for (r = savintregcnt - 1; r >= maxsavintreguse; r--) {
-               p--; i386_mov_reg_membase(savintregs[r], REG_SP, p * 8);
+       if (opt_prof) {
+               M_MOV_IMM((ptrint) m, REG_ITMP1);
+               M_IADD_IMM_MEMBASE(1, REG_ITMP1, OFFSET(methodinfo, executioncount));
        }
-       for (r = savfltregcnt - 1; r >= maxsavfltreguse; r--) {
-               p--; i386_fld_reg(savfltregs[r]); i386_fstpl_membase(REG_SP, p * 8);
-       }
-
-       /* save monitorenter argument */
 
-#ifdef USE_THREADS
-       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-               if (method->flags & ACC_STATIC) {
-                       i386_mov_imm_reg((s4) class, REG_ITMP1);
-                       i386_mov_reg_membase(REG_ITMP1, REG_SP, maxmemuse * 8);
-
-               } else {
-                       i386_mov_membase_reg(REG_SP, parentargs_base * 8 + 4, REG_ITMP1);
-                       i386_mov_reg_membase(REG_ITMP1, REG_SP, maxmemuse * 8);
-               }
-       }                       
-#endif
-
-       /* copy argument registers to stack and call trace function with pointer
-          to arguments on stack.
-       */
-
-       if (runverbose) {
-               i386_alu_imm_reg(I386_SUB, TRACE_ARGS_NUM * 8 + 4, REG_SP);
-
-               for (p = 0; p < mparamcount; p++) {
-                       t = mparamtypes[p];
-                       if (IS_INT_LNG_TYPE(t)) {
-                               if (IS_2_WORD_TYPE(t)) {
-                                       i386_mov_membase_reg(REG_SP, 4 + (parentargs_base + TRACE_ARGS_NUM + p) * 8 + 4, REG_ITMP1);
-                                       i386_mov_membase_reg(REG_SP, 4 + (parentargs_base + TRACE_ARGS_NUM + p) * 8 + 4 + 4, REG_ITMP2);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, p * 8 + 4);
-
-                               } else if (t == TYPE_ADR) {
-                                       i386_mov_membase_reg(REG_SP, 4 + (parentargs_base + TRACE_ARGS_NUM + p) * 8 + 4, REG_ITMP1);
-                                       i386_alu_reg_reg(I386_XOR, REG_ITMP2, REG_ITMP2);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, p * 8 + 4);
-
-                               } else {
-                                       i386_mov_membase_reg(REG_SP, 4 + (parentargs_base + TRACE_ARGS_NUM + p) * 8 + 4, EAX);
-                                       i386_cltd();
-                                       i386_mov_reg_membase(EAX, REG_SP, p * 8);
-                                       i386_mov_reg_membase(EDX, REG_SP, p * 8 + 4);
-                               }
-
-                       } else {
-                               if (t == TYPE_FLT) {
-                                       i386_flds_membase(REG_SP, 4 + (parentargs_base + TRACE_ARGS_NUM + p) * 8 + 4);
-                                       i386_fstps_membase(REG_SP, p * 8);
-                                       i386_alu_reg_reg(I386_XOR, REG_ITMP2, REG_ITMP2);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, p * 8 + 4);
-
-                               } else {
-                                       i386_fldl_membase(REG_SP, 4 + (parentargs_base + TRACE_ARGS_NUM + p) * 8 + 4);
-                                       i386_fstpl_membase(REG_SP, p * 8);
-                               }
-                       }
-               }
-
-               /* fill up the remaining arguments */
-               i386_alu_reg_reg(I386_XOR, REG_ITMP1, REG_ITMP1);
-               for (p = mparamcount; p < TRACE_ARGS_NUM; p++) {
-                       i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8);
-                       i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8 + 4);
-               }
+       /* create stack frame (if necessary) */
 
-               i386_mov_imm_membase((s4) method, REG_SP, TRACE_ARGS_NUM * 8);
+       if (parentargs_base)
+               M_ASUB_IMM(parentargs_base * 4, REG_SP);
 
-               i386_mov_imm_reg((s4) builtin_trace_args, REG_ITMP1);
-/*             i386_mov_imm_reg(asm_builtin_trace, REG_ITMP1); */
-               i386_call_reg(REG_ITMP1);
+       /* save return address and used callee saved registers */
 
-               i386_alu_imm_reg(I386_ADD, TRACE_ARGS_NUM * 8 + 4, REG_SP);
+       p = parentargs_base;
+       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+               p--; M_AST(rd->savintregs[i], REG_SP, p * 4);
+       }
+       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+               p-=2; i386_fld_reg(cd, rd->savfltregs[i]); i386_fstpl_membase(cd, REG_SP, p * 4);
        }
 
        /* take arguments out of register or stack frame */
 
-       for (p = 0, l = 0; p < mparamcount; p++) {
-               t = mparamtypes[p];
-               var = &(locals[l][t]);
+       md = m->parseddesc;
+
+       stack_off = 0;
+       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;
-               r = var->regoff; 
+                       continue;
+               s1 = md->params[p].regoff;
                if (IS_INT_LNG_TYPE(t)) {                    /* integer args          */
-                       if (p < intreg_argnum) {                 /* register arguments    */
-                               panic("integer register argument");
-                               if (!(var->flags & INMEMORY)) {      /* reg arg -> register   */
-/*                                     M_INTMOVE (argintregs[p], r); */
-
+                       if (!md->params[p].inmemory) {           /* register arguments    */
+                               log_text("integer register argument");
+                               assert(0);
+                               if (!(var->flags & INMEMORY)) {      /* reg arg -> register   */
+                                       /* rd->argintregs[md->params[p].regoff -> var->regoff     */
                                } else {                             /* reg arg -> spilled    */
-/*                                     M_LST (argintregs[p], REG_SP, 8 * r); */
-                               }
+                                       /* rd->argintregs[md->params[p].regoff -> var->regoff * 4 */
+                               }
                        } else {                                 /* stack arguments       */
-                               pa = p - intreg_argnum;
-                               if (!(var->flags & INMEMORY)) {      /* stack arg -> register */ 
-                                       i386_mov_membase_reg(REG_SP, (parentargs_base + pa) * 8 + 4, r);            /* + 4 for return address */
+                               if (!(var->flags & INMEMORY)) {      /* stack arg -> register */
+                                       i386_mov_membase_reg(           /* + 4 for return address */
+                                          cd, REG_SP, (parentargs_base + s1) * 4 + 4, var->regoff);
+                                                                       /* + 4 for return address */
                                } else {                             /* stack arg -> spilled  */
                                        if (!IS_2_WORD_TYPE(t)) {
-                                               i386_mov_membase_reg(REG_SP, (parentargs_base + pa) * 8 + 4, REG_ITMP1);    /* + 4 for return address */
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, r * 8);
+#if 0
+                                               i386_mov_membase_reg(       /* + 4 for return address */
+                                                cd, REG_SP, (parentargs_base + s1) * 4 + 4,
+                                                        REG_ITMP1);    
+                                               i386_mov_reg_membase(
+                                                   cd, REG_ITMP1, REG_SP, var->regoff * 4);
+#else
+                                                                 /* reuse Stackslotand avoid copying */
+                                               var->regoff = parentargs_base + s1 + 1;
+#endif
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, (parentargs_base + pa) * 8 + 4, REG_ITMP1);    /* + 4 for return address */
-                                               i386_mov_membase_reg(REG_SP, (parentargs_base + pa) * 8 + 4 + 4, REG_ITMP2);    /* + 4 for return address */
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, r * 8);
-                                               i386_mov_reg_membase(REG_ITMP2, REG_SP, r * 8 + 4);
+#if 0
+                                               i386_mov_membase_reg(       /* + 4 for return address */
+                                                   cd, REG_SP, (parentargs_base + s1) * 4 + 4,
+                                                       REG_ITMP1);
+                                               i386_mov_reg_membase(
+                                                   cd, REG_ITMP1, REG_SP, var->regoff * 4);
+                                               i386_mov_membase_reg(       /* + 4 for return address */
+                            cd, REG_SP, (parentargs_base + s1) * 4 + 4 + 4,
+                            REG_ITMP1);             
+                                               i386_mov_reg_membase(
+                                               cd, REG_ITMP1, REG_SP, var->regoff * 4 + 4);
+#else
+                                                                 /* reuse Stackslotand avoid copying */
+                                               var->regoff = parentargs_base + s1 + 1;
+#endif
                                        }
                                }
                        }
                
-               } else {                                     /* floating args         */   
-                       if (p < fltreg_argnum) {                 /* register arguments    */
-                               if (!(var->flags & INMEMORY)) {      /* reg arg -> register   */
-                                       panic("There are no float argument registers!");
-
-                               } else {                                         /* reg arg -> spilled    */
-                                       panic("There are no float argument registers!");
-                               }
-
-                       } else {                                 /* stack arguments       */
-                               pa = p - fltreg_argnum;
-                               if (!(var->flags & INMEMORY)) {      /* stack-arg -> register */
+               } else {                                     /* floating args         */
+                       if (!md->params[p].inmemory) {           /* register arguments    */
+                               log_text("There are no float argument registers!");
+                               assert(0);
+                               if (!(var->flags & INMEMORY)) {  /* reg arg -> register   */
+                                       /* rd->argfltregs[md->params[p].regoff -> var->regoff     */
+                               } else {                                     /* reg arg -> spilled    */
+                                       /* rd->argfltregs[md->params[p].regoff -> var->regoff * 4 */
+                               }
+
+                       } else {                                 /* stack arguments       */
+                               if (!(var->flags & INMEMORY)) {      /* stack-arg -> register */
                                        if (t == TYPE_FLT) {
-                                               i386_flds_membase(REG_SP, (parentargs_base + pa) * 8 + 4);
+                                               i386_flds_membase(
+                            cd, REG_SP, (parentargs_base + s1) * 4 + 4);
                                                fpu_st_offset++;
-                                               i386_fstp_reg(r + fpu_st_offset);
+                                               i386_fstp_reg(cd, var->regoff + fpu_st_offset);
                                                fpu_st_offset--;
 
                                        } else {
-                                               i386_fldl_membase(REG_SP, (parentargs_base + pa) * 8 + 4);
+                                               i386_fldl_membase(
+                            cd, REG_SP, (parentargs_base + s1) * 4 + 4);
                                                fpu_st_offset++;
-                                               i386_fstp_reg(r + fpu_st_offset);
+                                               i386_fstp_reg(cd, var->regoff + fpu_st_offset);
                                                fpu_st_offset--;
                                        }
 
-                               } else {                              /* stack-arg -> spilled  */
-/*                                     i386_mov_membase_reg(REG_SP, (parentargs_base + pa) * 8 + 4, REG_ITMP1); */
-/*                                     i386_mov_reg_membase(REG_ITMP1, REG_SP, r * 8); */
+                               } else {                             /* stack-arg -> spilled  */
+#if 0
+                                       i386_mov_membase_reg(
+                        cd, REG_SP, (parentargs_base + s1) * 4 + 4, REG_ITMP1);
+                                       i386_mov_reg_membase(
+                                           cd, REG_ITMP1, REG_SP, var->regoff * 4);
                                        if (t == TYPE_FLT) {
-                                               i386_flds_membase(REG_SP, (parentargs_base + pa) * 8 + 4);
-                                               i386_fstps_membase(REG_SP, r * 8);
-
+                                               i386_flds_membase(
+                                                   cd, REG_SP, (parentargs_base + s1) * 4 + 4);
+                                               i386_fstps_membase(cd, REG_SP, var->regoff * 4);
                                        } else {
-                                               i386_fldl_membase(REG_SP, (parentargs_base + pa) * 8 + 4);
-                                               i386_fstpl_membase(REG_SP, r * 8);
+                                               i386_fldl_membase(
+                            cd, REG_SP, (parentargs_base + s1) * 4 + 4);
+                                               i386_fstpl_membase(cd, REG_SP, var->regoff * 4);
                                        }
+#else
+                                                                 /* reuse Stackslotand avoid copying */
+                                               var->regoff = parentargs_base + s1 + 1;
+#endif
                                }
                        }
                }
@@ -694,24 +314,111 @@ void codegen()
 
        /* call monitorenter function */
 
-#ifdef USE_THREADS
-       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-               i386_mov_membase_reg(REG_SP, maxmemuse * 8, REG_ITMP1);
-               i386_alu_imm_reg(I386_SUB, 4, REG_SP);
-               i386_mov_reg_membase(REG_ITMP1, REG_SP, 0);
-               i386_mov_imm_reg((s4) builtin_monitorenter, REG_ITMP2);
-               i386_call_reg(REG_ITMP2);
-               i386_alu_imm_reg(I386_ADD, 4, REG_SP);
+#if defined(USE_THREADS)
+       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+               s1 = rd->memuse;
+
+               if (m->flags & ACC_STATIC) {
+                       i386_mov_imm_reg(cd, (ptrint) m->class, REG_ITMP1);
+                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, s1 * 4);
+                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, 0);
+                       i386_mov_imm_reg(cd, (ptrint) BUILTIN_staticmonitorenter, REG_ITMP1);
+                       i386_call_reg(cd, REG_ITMP1);
+
+               } else {
+                       i386_mov_membase_reg(cd, REG_SP, parentargs_base * 4 + 4, REG_ITMP1);
+                       i386_test_reg_reg(cd, REG_ITMP1, REG_ITMP1);
+                       i386_jcc(cd, I386_CC_Z, 0);
+                       codegen_addxnullrefs(cd, cd->mcodeptr);
+                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, s1 * 4);
+                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, 0);
+                       i386_mov_imm_reg(cd, (ptrint) BUILTIN_monitorenter, REG_ITMP1);
+                       i386_call_reg(cd, REG_ITMP1);
+               }
        }                       
 #endif
+
+       /* copy argument registers to stack and call trace function with pointer
+          to arguments on stack.
+       */
+
+       if (runverbose) {
+               stack_off = 0;
+               s1 = INT_TMP_CNT * 4 + TRACE_ARGS_NUM * 8 + 4 + 4 + parentargs_base * 4;
+
+               M_ISUB_IMM(INT_TMP_CNT * 4 + TRACE_ARGS_NUM * 8 + 4, REG_SP);
+
+               /* save temporary registers for leaf methods */
+
+               for (p = 0; p < INT_TMP_CNT; p++)
+                       M_IST(rd->tmpintregs[p], REG_SP, TRACE_ARGS_NUM * 8 + 4 + p * 4);
+
+               for (p = 0, l = 0; p < md->paramcount && p < TRACE_ARGS_NUM; p++) {
+                       t = md->paramtypes[p].type;
+
+                       if (IS_INT_LNG_TYPE(t)) {
+                               if (IS_2_WORD_TYPE(t)) {
+                                       i386_mov_membase_reg(cd, REG_SP, s1 + stack_off, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, p * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, s1 + stack_off + 4, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, p * 8 + 4);
+
+                               } else if (t == TYPE_ADR) {
+/*                             } else { */
+                                       i386_mov_membase_reg(cd, REG_SP, s1 + stack_off, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, p * 8);
+                                       i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP1, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, p * 8 + 4);
+
+                               } else {
+                                       i386_mov_membase_reg(cd, REG_SP, s1 + stack_off, EAX);
+                                       i386_cltd(cd);
+                                       i386_mov_reg_membase(cd, EAX, REG_SP, p * 8);
+                                       i386_mov_reg_membase(cd, EDX, REG_SP, p * 8 + 4);
+                               }
+
+                       } else {
+                               if (!IS_2_WORD_TYPE(t)) {
+                                       i386_flds_membase(cd, REG_SP, s1 + stack_off);
+                                       i386_fstps_membase(cd, REG_SP, p * 8);
+                                       i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP1, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, p * 8 + 4);
+
+                               } else {
+                                       i386_fldl_membase(cd, REG_SP, s1 + stack_off);
+                                       i386_fstpl_membase(cd, REG_SP, p * 8);
+                               }
+                       }
+                       stack_off += (IS_2_WORD_TYPE(t)) ? 8 : 4;
+               }
+
+               /* fill up the remaining arguments */
+               i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP1, REG_ITMP1);
+               for (p = md->paramcount; p < TRACE_ARGS_NUM; p++) {
+                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, p * 8);
+                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, p * 8 + 4);
+               }
+
+               i386_mov_imm_membase(cd, (ptrint) m, REG_SP, TRACE_ARGS_NUM * 8);
+               i386_mov_imm_reg(cd, (ptrint) builtin_trace_args, REG_ITMP1);
+               i386_call_reg(cd, REG_ITMP1);
+
+               /* restore temporary registers for leaf methods */
+
+               for (p = 0; p < INT_TMP_CNT; p++)
+                       M_ILD(rd->tmpintregs[p], REG_SP, TRACE_ARGS_NUM * 8 + 4 + p * 4);
+
+               M_IADD_IMM(INT_TMP_CNT * 4 + TRACE_ARGS_NUM * 8 + 4, REG_SP);
+       }
+
        }
 
        /* end of header generation */
 
        /* walk through all basic blocks */
-       for (bptr = block; bptr != NULL; bptr = bptr->next) {
+       for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
 
-               bptr->mpc = (int)((u1*) mcodeptr - mcodebase);
+               bptr->mpc = (s4) (cd->mcodeptr - cd->mcodebase);
 
                if (bptr->flags >= BBREACHED) {
 
@@ -719,8 +426,9 @@ void codegen()
 
                branchref *brefs;
                for (brefs = bptr->branchrefs; brefs != NULL; brefs = brefs->next) {
-                       gen_resolvebranch((u1*) mcodebase + brefs->branchpos, 
-                                         brefs->branchpos, bptr->mpc);
+                       gen_resolvebranch(cd->mcodebase + brefs->branchpos, 
+                                         brefs->branchpos,
+                                                         bptr->mpc);
                }
 
                /* copy interface registers to their destination */
@@ -728,61 +436,99 @@ void codegen()
                src = bptr->instack;
                len = bptr->indepth;
                MCODECHECK(64+len);
-               while (src != NULL) {
-                       len--;
-                       if ((len == 0) && (bptr->type != BBTYPE_STD)) {
-                               if (!IS_2_WORD_TYPE(src->type)) {
-                                       if (bptr->type == BBTYPE_SBR) {
-                                               d = reg_of_var(src, REG_ITMP1);
-                                               i386_pop_reg(d);
-                                               store_reg_to_var_int(src, d);
 
+#if defined(ENABLE_LSRA)
+               if (opt_lsra) {
+                       while (src != NULL) {
+                               len--;
+                               if ((len == 0) && (bptr->type != BBTYPE_STD)) {
+                                       if (!IS_2_WORD_TYPE(src->type)) {
+                                               if (bptr->type == BBTYPE_SBR) {
+                                                       /*                                                      d = reg_of_var(m, src, REG_ITMP1); */
+                                                       if (!(src->flags & INMEMORY))
+                                                               d = src->regoff;
+                                                       else
+                                                               d = REG_ITMP1;
+
+                                                       i386_pop_reg(cd, d);
+                                                       store_reg_to_var_int(src, d);
+
+                                               } else if (bptr->type == BBTYPE_EXH) {
+                                                       /*                                                      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);
+                                               }
+
+                                       } else {
+                                               log_text("copy interface registers(EXH, SBR): longs have to be in memory (begin 1)");
+                                               assert(0);
+                                       }
+                               }
+                               src = src->prev;
+                       }
+
+               } else {
+#endif
+                       while (src != NULL) {
+                               len--;
+                               if ((len == 0) && (bptr->type != BBTYPE_STD)) {
+                                       if (!IS_2_WORD_TYPE(src->type)) {
+                                               if (bptr->type == BBTYPE_SBR) {
+                                                       d = reg_of_var(rd, src, REG_ITMP1);
+                                                       i386_pop_reg(cd, d);
+                                                       store_reg_to_var_int(src, d);
                                        } else if (bptr->type == BBTYPE_EXH) {
-                                               d = reg_of_var(src, REG_ITMP1);
+                                               d = reg_of_var(rd, src, REG_ITMP1);
                                                M_INTMOVE(REG_ITMP1, d);
                                                store_reg_to_var_int(src, d);
                                        }
 
                                } else {
-                                       panic("copy interface registers: longs have to me in memory (begin 1)");
+                                       log_text("copy interface registers: longs have to be in memory (begin 1)");
+                                       assert(0);
                                }
 
                        } else {
-                               d = reg_of_var(src, REG_ITMP1);
+                               d = reg_of_var(rd, src, REG_ITMP1);
                                if ((src->varkind != STACKVAR)) {
                                        s2 = src->type;
                                        if (IS_FLT_DBL_TYPE(s2)) {
-                                               s1 = interfaces[len][s2].regoff;
-                                               if (!(interfaces[len][s2].flags & INMEMORY)) {
+                                               s1 = rd->interfaces[len][s2].regoff;
+                                               if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
                                                        M_FLTMOVE(s1, d);
 
                                                } else {
                                                        if (s2 == TYPE_FLT) {
-                                                               i386_flds_membase(REG_SP, s1 * 8);
+                                                               i386_flds_membase(cd, REG_SP, s1 * 4);
 
                                                        } else {
-                                                               i386_fldl_membase(REG_SP, s1 * 8);
+                                                               i386_fldl_membase(cd, REG_SP, s1 * 4);
                                                        }
                                                }
                                                store_reg_to_var_flt(src, d);
 
                                        } else {
-                                               s1 = interfaces[len][s2].regoff;
-                                               if (!IS_2_WORD_TYPE(interfaces[len][s2].type)) {
-                                                       if (!(interfaces[len][s2].flags & INMEMORY)) {
+                                               s1 = rd->interfaces[len][s2].regoff;
+                                               if (!IS_2_WORD_TYPE(rd->interfaces[len][s2].type)) {
+                                                       if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
                                                                M_INTMOVE(s1, d);
 
                                                        } else {
-                                                               i386_mov_membase_reg(REG_SP, s1 * 8, d);
+                                                               i386_mov_membase_reg(cd, REG_SP, s1 * 4, d);
                                                        }
                                                        store_reg_to_var_int(src, d);
 
                                                } else {
-                                                       if (interfaces[len][s2].flags & INMEMORY) {
+                                                       if (rd->interfaces[len][s2].flags & INMEMORY) {
                                                                M_LNGMEMMOVE(s1, src->regoff);
 
                                                        } else {
-                                                               panic("copy interface registers: longs have to be in memory (begin 2)");
+                                                               log_text("copy interface registers: longs have to be in memory (begin 2)");
+                                                               assert(0);
                                                        }
                                                }
                                        }
@@ -790,30 +536,46 @@ void codegen()
                        }
                        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, cd->mcodeptr);
+                               currentline = iptr->line;
+                       }
+
+                       MCODECHECK(100);   /* XXX are 100 bytes enough? */
 
-       MCODECHECK(64);           /* an instruction usually needs < 64 words      */
-       switch (iptr->opc) {
+               switch (iptr->opc) {
+               case ICMD_INLINE_START:
+               case ICMD_INLINE_END:
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: NO ECX: NO EDX: NO */
+                       break;
 
                case ICMD_NOP:        /* ...  ==> ...                                 */
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: NO ECX: NO EDX: NO */
                        break;
 
-               case ICMD_NULLCHECKPOP: /* ..., objectref  ==> ...                    */
+               case ICMD_CHECKNULL:  /* ..., objectref  ==> ..., objectref           */
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: NO ECX: NO EDX: NO */
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, 0, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_test_reg_reg(src->regoff, src->regoff);
+                               i386_test_reg_reg(cd, src->regoff, src->regoff);
                        }
-                       i386_jcc(I386_CC_E, 0);
-                       codegen_addxnullrefs(mcodeptr);
+                       i386_jcc(cd, I386_CC_Z, 0);
+                       codegen_addxnullrefs(cd, cd->mcodeptr);
                        break;
 
                /* constant operations ************************************************/
@@ -821,16 +583,19 @@ void codegen()
                case ICMD_ICONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.i = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: NO ECX: NO EDX: NO */
+
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_imm_membase(iptr->val.i, REG_SP, iptr->dst->regoff * 8);
+                               M_IST_IMM(iptr->val.i, REG_SP, iptr->dst->regoff * 4);
 
                        } else {
                                if (iptr->val.i == 0) {
-                                       i386_alu_reg_reg(I386_XOR, d, d);
+                                       M_CLR(d);
 
                                } else {
-                                       i386_mov_imm_reg(iptr->val.i, d);
+                                       M_MOV_IMM(iptr->val.i, d);
                                }
                        }
                        break;
@@ -838,44 +603,51 @@ void codegen()
                case ICMD_LCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.l = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: NO ECX: NO EDX: NO */
+
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_imm_membase(iptr->val.l, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_imm_membase(iptr->val.l >> 32, REG_SP, iptr->dst->regoff * 8 + 4);
+                               M_IST_IMM(iptr->val.l, REG_SP, iptr->dst->regoff * 4);
+                               M_IST_IMM(iptr->val.l >> 32, REG_SP, iptr->dst->regoff * 4 + 4);
                                
                        } else {
-                               panic("LCONST: longs have to be in memory");
+                               log_text("LCONST: longs have to be in memory");
+                               assert(0);
                        }
                        break;
 
                case ICMD_FCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.f = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_FTMP1);
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: YES ECX: NO EDX: NO */
+
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if (iptr->val.f == 0.0) {
-                               i386_fldz();
+                               i386_fldz(cd);
                                fpu_st_offset++;
 
                                /* -0.0 */
                                if (iptr->val.i == 0x80000000) {
-                                       i386_fchs();
+                                       i386_fchs(cd);
                                }
 
                        } else if (iptr->val.f == 1.0) {
-                               i386_fld1();
+                               i386_fld1(cd);
                                fpu_st_offset++;
 
                        } else if (iptr->val.f == 2.0) {
-                               i386_fld1();
-                               i386_fld1();
-                               i386_faddp();
+                               i386_fld1(cd);
+                               i386_fld1(cd);
+                               i386_faddp(cd);
                                fpu_st_offset++;
 
                        } else {
-                               a = dseg_addfloat(iptr->val.f);
-                               i386_mov_imm_reg(0, REG_ITMP1);
-                               dseg_adddata(mcodeptr);
-                               i386_flds_membase(REG_ITMP1, a);
+                               disp = dseg_addfloat(cd, iptr->val.f);
+                               i386_mov_imm_reg(cd, 0, REG_ITMP1);
+                               dseg_adddata(cd, cd->mcodeptr);
+                               i386_flds_membase(cd, REG_ITMP1, disp);
                                fpu_st_offset++;
                        }
                        store_reg_to_var_flt(iptr->dst, d);
@@ -884,31 +656,34 @@ void codegen()
                case ICMD_DCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.d = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_FTMP1);
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: YES ECX: NO EDX: NO */
+
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if (iptr->val.d == 0.0) {
-                               i386_fldz();
+                               i386_fldz(cd);
                                fpu_st_offset++;
 
                                /* -0.0 */
                                if (iptr->val.l == 0x8000000000000000LL) {
-                                       i386_fchs();
+                                       i386_fchs(cd);
                                }
 
                        } else if (iptr->val.d == 1.0) {
-                               i386_fld1();
+                               i386_fld1(cd);
                                fpu_st_offset++;
 
                        } else if (iptr->val.d == 2.0) {
-                               i386_fld1();
-                               i386_fld1();
-                               i386_faddp();
+                               i386_fld1(cd);
+                               i386_fld1(cd);
+                               i386_faddp(cd);
                                fpu_st_offset++;
 
                        } else {
-                               a = dseg_adddouble(iptr->val.d);
-                               i386_mov_imm_reg(0, REG_ITMP1);
-                               dseg_adddata(mcodeptr);
-                               i386_fldl_membase(REG_ITMP1, a);
+                               disp = dseg_adddouble(cd, iptr->val.d);
+                               i386_mov_imm_reg(cd, 0, REG_ITMP1);
+                               dseg_adddata(cd, cd->mcodeptr);
+                               i386_fldl_membase(cd, REG_ITMP1, disp);
                                fpu_st_offset++;
                        }
                        store_reg_to_var_flt(iptr->dst, d);
@@ -917,16 +692,33 @@ void codegen()
                case ICMD_ACONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.a = constant                    */
 
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
-                       if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_imm_membase((s4) iptr->val.a, REG_SP, iptr->dst->regoff * 8);
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: YES ECX: NO EDX: NO */
+
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+
+                       if ((iptr->target != NULL) && (iptr->val.a == NULL)) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_aconst,
+                                                                       (unresolved_class *) iptr->target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
+
+                               M_MOV_IMM((ptrint) iptr->val.a, d);
+                               store_reg_to_var_int(iptr->dst, d);
 
                        } else {
-                               if ((s4) iptr->val.a == 0) {
-                                       i386_alu_reg_reg(I386_XOR, d, d);
+                               if (iptr->dst->flags & INMEMORY) {
+                                       M_AST_IMM((ptrint) iptr->val.a, REG_SP, iptr->dst->regoff * 4);
 
                                } else {
-                                       i386_mov_imm_reg((s4) iptr->val.a, d);
+                                       if ((ptrint) iptr->val.a == 0) {
+                                               M_CLR(d);
+                                       } else {
+                                               M_MOV_IMM((ptrint) iptr->val.a, d);
+                                       }
                                }
                        }
                        break;
@@ -936,25 +728,27 @@ void codegen()
 
                case ICMD_ILOAD:      /* ...  ==> ..., content of local variable      */
                case ICMD_ALOAD:      /* op1 = local variable                         */
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       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]);
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
                        if (iptr->dst->flags & INMEMORY) {
                                if (var->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, var->regoff * 8, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, var->regoff * 4, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else {
-                                       i386_mov_reg_membase(var->regoff, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_reg_membase(cd, var->regoff, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if (var->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, var->regoff * 8, iptr->dst->regoff);
+                                       i386_mov_membase_reg(cd, REG_SP, var->regoff * 4, iptr->dst->regoff);
 
                                } else {
                                        M_INTMOVE(var->regoff, iptr->dst->regoff);
@@ -964,40 +758,46 @@ void codegen()
 
                case ICMD_LLOAD:      /* ...  ==> ..., content of local variable      */
                                      /* op1 = local variable                         */
-
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       /* REG_RES Register usage: see lsra.inc icmd_uses_tmp */
+                       /* EAX: NO ECX: NO EDX: NO */
+  
+                       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]);
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
                        if (iptr->dst->flags & INMEMORY) {
                                if (var->flags & INMEMORY) {
                                        M_LNGMEMMOVE(var->regoff, iptr->dst->regoff);
 
                                } else {
-                                       panic("LLOAD: longs have to be in memory");
+                                       log_text("LLOAD: longs have to be in memory");
+                                       assert(0);
                                }
 
                        } else {
-                               panic("LLOAD: longs have to be in memory");
+                               log_text("LLOAD: longs have to be in memory");
+                               assert(0);
                        }
                        break;
 
                case ICMD_FLOAD:      /* ...  ==> ..., content of local variable      */
                                      /* op1 = local variable                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
 
-                       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]);
                        if (var->flags & INMEMORY) {
-                               i386_flds_membase(REG_SP, var->regoff * 8);
+                               i386_flds_membase(cd, REG_SP, var->regoff * 4);
                                fpu_st_offset++;
                        } else {
-                               i386_fld_reg(var->regoff + fpu_st_offset);
+                               i386_fld_reg(cd, var->regoff + fpu_st_offset);
                                fpu_st_offset++;
                        }
                        store_reg_to_var_flt(iptr->dst, d);
@@ -1005,18 +805,20 @@ void codegen()
 
                case ICMD_DLOAD:      /* ...  ==> ..., content of local variable      */
                                      /* op1 = local variable                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
 
-                       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]);
                        if (var->flags & INMEMORY) {
-                               i386_fldl_membase(REG_SP, var->regoff * 8);
+                               i386_fldl_membase(cd, REG_SP, var->regoff * 4);
                                fpu_st_offset++;
                        } else {
-                               i386_fld_reg(var->regoff + fpu_st_offset);
+                               i386_fld_reg(cd, var->regoff + fpu_st_offset);
                                fpu_st_offset++;
                        }
                        store_reg_to_var_flt(iptr->dst, d);
@@ -1024,19 +826,21 @@ void codegen()
 
                case ICMD_ISTORE:     /* ..., value  ==> ...                          */
                case ICMD_ASTORE:     /* op1 = local variable                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
                        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) {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, var->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, var->regoff * 4);
                                        
                                } else {
-                                       i386_mov_reg_membase(src->regoff, REG_SP, var->regoff * 8);
+                                       i386_mov_reg_membase(cd, src->regoff, REG_SP, var->regoff * 4);
                                }
 
                        } else {
@@ -1047,61 +851,69 @@ void codegen()
 
                case ICMD_LSTORE:     /* ..., value  ==> ...                          */
                                      /* op1 = local variable                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
 
                        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) {
                                if (src->flags & INMEMORY) {
                                        M_LNGMEMMOVE(src->regoff, var->regoff);
 
                                } else {
-                                       panic("LSTORE: longs have to be in memory");
+                                       log_text("LSTORE: longs have to be in memory");
+                                       assert(0);
                                }
 
                        } else {
-                               panic("LSTORE: longs have to be in memory");
+                               log_text("LSTORE: longs have to be in memory");
+                               assert(0);
                        }
                        break;
 
                case ICMD_FSTORE:     /* ..., value  ==> ...                          */
                                      /* op1 = local variable                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
 
                        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_flt(s1, src, REG_FTMP1);
-                               i386_fstps_membase(REG_SP, var->regoff * 8);
+                               i386_fstps_membase(cd, REG_SP, var->regoff * 4);
                                fpu_st_offset--;
                        } else {
                                var_to_reg_flt(s1, src, var->regoff);
 /*                             M_FLTMOVE(s1, var->regoff); */
-                               i386_fstp_reg(var->regoff + fpu_st_offset);
+                               i386_fstp_reg(cd, var->regoff + fpu_st_offset);
                                fpu_st_offset--;
                        }
                        break;
 
                case ICMD_DSTORE:     /* ..., value  ==> ...                          */
                                      /* op1 = local variable                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
 
                        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_flt(s1, src, REG_FTMP1);
-                               i386_fstpl_membase(REG_SP, var->regoff * 8);
+                               i386_fstpl_membase(cd, REG_SP, var->regoff * 4);
                                fpu_st_offset--;
                        } else {
                                var_to_reg_flt(s1, src, var->regoff);
 /*                             M_FLTMOVE(s1, var->regoff); */
-                               i386_fstp_reg(var->regoff + fpu_st_offset);
+                               i386_fstp_reg(cd, var->regoff + fpu_st_offset);
                                fpu_st_offset--;
                        }
                        break;
@@ -1113,77 +925,69 @@ void codegen()
 
                case ICMD_POP:        /* ..., value  ==> ...                          */
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
                        break;
 
-#define M_COPY(from,to) \
-               d = reg_of_var(to, REG_ITMP1); \
-                       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_FLTMOVE(s1, d);*/ \
-                                       store_reg_to_var_flt(to, d); \
-                               } else { \
-                    if (!IS_2_WORD_TYPE(from->type)) { \
-                        if (to->flags & INMEMORY) { \
-                             if (from->flags & INMEMORY) { \
-                                 i386_mov_membase_reg(REG_SP, from->regoff * 8, REG_ITMP1); \
-                                 i386_mov_reg_membase(REG_ITMP1, REG_SP, to->regoff * 8); \
-                             } else { \
-                                 i386_mov_reg_membase(from->regoff, REG_SP, to->regoff * 8); \
-                             } \
-                        } else { \
-                             if (from->flags & INMEMORY) { \
-                                 i386_mov_membase_reg(REG_SP, from->regoff * 8, to->regoff); \
-                             } else { \
-                                 i386_mov_reg_reg(from->regoff, to->regoff); \
-                             } \
-                        } \
-                    } else { \
-                        M_LNGMEMMOVE(from->regoff, to->regoff); \
-                    } \
-                               } \
-                       }
-
                case ICMD_DUP:        /* ..., a ==> ..., a, a                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
                        M_COPY(src, iptr->dst);
                        break;
 
-               case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
-
-                       M_COPY(src,       iptr->dst->prev->prev);
-
                case ICMD_DUP2:       /* ..., a, b ==> ..., a, b, a, b                */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
                        M_COPY(src,       iptr->dst);
                        M_COPY(src->prev, iptr->dst->prev);
                        break;
 
-               case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
+               case ICMD_DUP_X1:     /* ..., a, b ==> ..., b, a, b                   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       M_COPY(src->prev,       iptr->dst->prev->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(src, iptr->dst->prev->prev->prev);
+                       M_COPY(iptr->dst,       iptr->dst->prev->prev->prev);
+                       break;
+
+               case ICMD_DUP2_X1:    /* ..., a, b, c ==> ..., b, c, a, b, c          */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
+
+                       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);
+                       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    */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
                        M_COPY(src,                   iptr->dst);
                        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                      */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       M_COPY(src, iptr->dst->prev);
+                       M_COPY(src,       iptr->dst->prev);
                        M_COPY(src->prev, iptr->dst);
                        break;
 
@@ -1191,224 +995,243 @@ void codegen()
                /* integer operations *************************************************/
 
                case ICMD_INEG:       /* ..., value  ==> ..., - value                 */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_neg_membase(REG_SP, iptr->dst->regoff * 8);
+                                               i386_neg_membase(cd, REG_SP, iptr->dst->regoff * 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_neg_reg(REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_neg_reg(cd, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
                                        }
 
                                } else {
-                                       i386_mov_reg_membase(src->regoff, REG_SP, iptr->dst->regoff * 8);
-                                       i386_neg_membase(REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_reg_membase(cd, src->regoff, REG_SP, iptr->dst->regoff * 4);
+                                       i386_neg_membase(cd, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
-                                       i386_neg_reg(iptr->dst->regoff);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, iptr->dst->regoff);
+                                       i386_neg_reg(cd, iptr->dst->regoff);
 
                                } else {
                                        M_INTMOVE(src->regoff, iptr->dst->regoff);
-                                       i386_neg_reg(iptr->dst->regoff);
+                                       i386_neg_reg(cd, iptr->dst->regoff);
                                }
                        }
                        break;
 
                case ICMD_LNEG:       /* ..., value  ==> ..., - value                 */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_neg_membase(REG_SP, iptr->dst->regoff * 8);
-                                               i386_alu_imm_membase(I386_ADC, 0, REG_SP, iptr->dst->regoff * 8 + 4);
-                                               i386_neg_membase(REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_neg_membase(cd, REG_SP, iptr->dst->regoff * 4);
+                                               i386_alu_imm_membase(cd, ALU_ADC, 0, REG_SP, iptr->dst->regoff * 4 + 4);
+                                               i386_neg_membase(cd, REG_SP, iptr->dst->regoff * 4 + 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_neg_reg(REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_imm_reg(I386_ADC, 0, REG_ITMP1);
-                                               i386_neg_reg(REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_neg_reg(cd, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_imm_reg(cd, ALU_ADC, 0, REG_ITMP1);
+                                               i386_neg_reg(cd, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
                                        }
                                }
                        }
                        break;
 
                case ICMD_I2L:        /* ..., value  ==> ..., value                   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: YES */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, EAX);
-                                       i386_cltd();
-                                       i386_mov_reg_membase(EAX, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_reg_membase(EDX, REG_SP, iptr->dst->regoff * 8 + 4);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, EAX);
+                                       i386_cltd(cd);
+                                       i386_mov_reg_membase(cd, EAX, REG_SP, iptr->dst->regoff * 4);
+                                       i386_mov_reg_membase(cd, EDX, REG_SP, iptr->dst->regoff * 4 + 4);
 
                                } else {
                                        M_INTMOVE(src->regoff, EAX);
-                                       i386_cltd();
-                                       i386_mov_reg_membase(EAX, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_reg_membase(EDX, REG_SP, iptr->dst->regoff * 8 + 4);
+                                       i386_cltd(cd);
+                                       i386_mov_reg_membase(cd, EAX, REG_SP, iptr->dst->regoff * 4);
+                                       i386_mov_reg_membase(cd, EDX, REG_SP, iptr->dst->regoff * 4 + 4);
                                }
                        }
                        break;
 
                case ICMD_L2I:        /* ..., value  ==> ..., value                   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, iptr->dst->regoff);
                                }
                        }
                        break;
 
                case ICMD_INT2BYTE:   /* ..., value  ==> ..., value                   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SHL, 24, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SAR, 24, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SHL, 24, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SAR, 24, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else {
-                                       i386_mov_reg_membase(src->regoff, REG_SP, iptr->dst->regoff * 8);
-                                       i386_shift_imm_membase(I386_SHL, 24, REG_SP, iptr->dst->regoff * 8);
-                                       i386_shift_imm_membase(I386_SAR, 24, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_reg_membase(cd, src->regoff, REG_SP, iptr->dst->regoff * 4);
+                                       i386_shift_imm_membase(cd, I386_SHL, 24, REG_SP, iptr->dst->regoff * 4);
+                                       i386_shift_imm_membase(cd, I386_SAR, 24, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SHL, 24, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SAR, 24, iptr->dst->regoff);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SHL, 24, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SAR, 24, iptr->dst->regoff);
 
                                } else {
                                        M_INTMOVE(src->regoff, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SHL, 24, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SAR, 24, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SHL, 24, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SAR, 24, iptr->dst->regoff);
                                }
                        }
                        break;
 
                case ICMD_INT2CHAR:   /* ..., value  ==> ..., value                   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_alu_imm_membase(I386_AND, 0x0000ffff, REG_SP, iptr->dst->regoff * 8);
+                                               i386_alu_imm_membase(cd, ALU_AND, 0x0000ffff, REG_SP, iptr->dst->regoff * 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_alu_imm_reg(I386_AND, 0x0000ffff, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_alu_imm_reg(cd, ALU_AND, 0x0000ffff, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
                                        }
 
                                } else {
-                                       i386_mov_reg_membase(src->regoff, REG_SP, iptr->dst->regoff * 8);
-                                       i386_alu_imm_membase(I386_AND, 0x0000ffff, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_reg_membase(cd, src->regoff, REG_SP, iptr->dst->regoff * 4);
+                                       i386_alu_imm_membase(cd, ALU_AND, 0x0000ffff, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
-                                       i386_alu_imm_reg(I386_AND, 0x0000ffff, iptr->dst->regoff);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, iptr->dst->regoff);
+                                       i386_alu_imm_reg(cd, ALU_AND, 0x0000ffff, iptr->dst->regoff);
 
                                } else {
                                        M_INTMOVE(src->regoff, iptr->dst->regoff);
-                                       i386_alu_imm_reg(I386_AND, 0x0000ffff, iptr->dst->regoff);
+                                       i386_alu_imm_reg(cd, ALU_AND, 0x0000ffff, iptr->dst->regoff);
                                }
                        }
                        break;
 
                case ICMD_INT2SHORT:  /* ..., value  ==> ..., value                   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SHL, 16, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SAR, 16, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SHL, 16, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SAR, 16, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else {
-                                       i386_mov_reg_membase(src->regoff, REG_SP, iptr->dst->regoff * 8);
-                                       i386_shift_imm_membase(I386_SHL, 16, REG_SP, iptr->dst->regoff * 8);
-                                       i386_shift_imm_membase(I386_SAR, 16, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_reg_membase(cd, src->regoff, REG_SP, iptr->dst->regoff * 4);
+                                       i386_shift_imm_membase(cd, I386_SHL, 16, REG_SP, iptr->dst->regoff * 4);
+                                       i386_shift_imm_membase(cd, I386_SAR, 16, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SHL, 16, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SAR, 16, iptr->dst->regoff);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SHL, 16, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SAR, 16, iptr->dst->regoff);
 
                                } else {
                                        M_INTMOVE(src->regoff, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SHL, 16, iptr->dst->regoff);
-                                       i386_shift_imm_reg(I386_SAR, 16, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SHL, 16, iptr->dst->regoff);
+                                       i386_shift_imm_reg(cd, I386_SAR, 16, iptr->dst->regoff);
                                }
                        }
                        break;
 
 
                case ICMD_IADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialu(I386_ADD, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialu(cd, ALU_ADD, src, iptr);
                        break;
 
                case ICMD_IADDCONST:  /* ..., value  ==> ..., value + constant        */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       /* should we use a inc optimization for smaller code size? */
-                       i386_emit_ialuconst(I386_ADD, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialuconst(cd, ALU_ADD, src, iptr);
                        break;
 
                case ICMD_LADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_alu_reg_membase(I386_ADD, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_reg_membase(I386_ADC, REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_alu_reg_membase(cd, ALU_ADD, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_reg_membase(cd, ALU_ADC, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
 
                                        } else if (src->prev->regoff == iptr->dst->regoff) {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_alu_reg_membase(I386_ADD, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_reg_membase(I386_ADC, REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_alu_reg_membase(cd, ALU_ADD, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_reg_membase(cd, ALU_ADC, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_alu_membase_reg(I386_ADD, REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_membase_reg(I386_ADC, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_alu_membase_reg(cd, ALU_ADD, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_membase_reg(cd, ALU_ADC, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
                                        }
 
                                }
@@ -1417,92 +1240,97 @@ void codegen()
 
                case ICMD_LADDCONST:  /* ..., value  ==> ..., value + constant        */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
+                       /* else path can never happen? longs stay in memory! */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_alu_imm_membase(I386_ADD, iptr->val.l, REG_SP, iptr->dst->regoff * 8);
-                                               i386_alu_imm_membase(I386_ADC, iptr->val.l >> 32, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_alu_imm_membase(cd, ALU_ADD, iptr->val.l, REG_SP, iptr->dst->regoff * 4);
+                                               i386_alu_imm_membase(cd, ALU_ADC, iptr->val.l >> 32, REG_SP, iptr->dst->regoff * 4 + 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_alu_imm_reg(I386_ADD, iptr->val.l, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_imm_reg(I386_ADC, iptr->val.l >> 32, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_alu_imm_reg(cd, ALU_ADD, iptr->val.l, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_imm_reg(cd, ALU_ADC, iptr->val.l >> 32, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
                                        }
                                }
                        }
                        break;
 
                case ICMD_ISUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
                                        if (src->prev->regoff == iptr->dst->regoff) {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_alu_reg_membase(I386_SUB, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_alu_reg_membase(cd, ALU_SUB, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_alu_membase_reg(I386_SUB, REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_alu_membase_reg(cd, ALU_SUB, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
                                        }
 
                                } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
                                        M_INTMOVE(src->prev->regoff, REG_ITMP1);
-                                       i386_alu_membase_reg(I386_SUB, REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_alu_membase_reg(cd, ALU_SUB, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
                                        if (src->prev->regoff == iptr->dst->regoff) {
-                                               i386_alu_reg_membase(I386_SUB, src->regoff, REG_SP, iptr->dst->regoff * 8);
+                                               i386_alu_reg_membase(cd, ALU_SUB, src->regoff, REG_SP, iptr->dst->regoff * 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_alu_reg_reg(I386_SUB, src->regoff, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_alu_reg_reg(cd, ALU_SUB, src->regoff, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
                                        }
 
                                } else {
-                                       i386_mov_reg_membase(src->prev->regoff, REG_SP, iptr->dst->regoff * 8);
-                                       i386_alu_reg_membase(I386_SUB, src->regoff, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_reg_membase(cd, src->prev->regoff, REG_SP, iptr->dst->regoff * 4);
+                                       i386_alu_reg_membase(cd, ALU_SUB, src->regoff, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, d);
-                                       i386_alu_membase_reg(I386_SUB, REG_SP, src->regoff * 8, d);
+                                       i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, d);
+                                       i386_alu_membase_reg(cd, ALU_SUB, REG_SP, src->regoff * 4, d);
 
                                } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
                                        M_INTMOVE(src->prev->regoff, d);
-                                       i386_alu_membase_reg(I386_SUB, REG_SP, src->regoff * 8, d);
+                                       i386_alu_membase_reg(cd, ALU_SUB, REG_SP, src->regoff * 4, d);
 
                                } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
                                        /* workaround for reg alloc */
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_alu_reg_reg(I386_SUB, src->regoff, REG_ITMP1);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_alu_reg_reg(cd, ALU_SUB, src->regoff, REG_ITMP1);
                                                M_INTMOVE(REG_ITMP1, d);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, d);
-                                               i386_alu_reg_reg(I386_SUB, src->regoff, d);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, d);
+                                               i386_alu_reg_reg(cd, ALU_SUB, src->regoff, d);
                                        }
 
                                } else {
                                        /* workaround for reg alloc */
                                        if (src->regoff == iptr->dst->regoff) {
                                                M_INTMOVE(src->prev->regoff, REG_ITMP1);
-                                               i386_alu_reg_reg(I386_SUB, src->regoff, REG_ITMP1);
+                                               i386_alu_reg_reg(cd, ALU_SUB, src->regoff, REG_ITMP1);
                                                M_INTMOVE(REG_ITMP1, d);
 
                                        } else {
                                                M_INTMOVE(src->prev->regoff, d);
-                                               i386_alu_reg_reg(I386_SUB, src->regoff, d);
+                                               i386_alu_reg_reg(cd, ALU_SUB, src->regoff, d);
                                        }
                                }
                        }
@@ -1510,29 +1338,33 @@ void codegen()
 
                case ICMD_ISUBCONST:  /* ..., value  ==> ..., value + constant        */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialuconst(I386_SUB, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialuconst(cd, ALU_SUB, src, iptr);
                        break;
 
                case ICMD_LSUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
                                        if (src->prev->regoff == iptr->dst->regoff) {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_alu_reg_membase(I386_SUB, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_reg_membase(I386_SBB, REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_alu_reg_membase(cd, ALU_SUB, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_reg_membase(cd, ALU_SBB, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
 
                                        } else {
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_alu_membase_reg(I386_SUB, REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_membase_reg(I386_SBB, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_alu_membase_reg(cd, ALU_SUB, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_membase_reg(cd, ALU_SBB, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
                                        }
                                }
                        }
@@ -1540,72 +1372,77 @@ void codegen()
 
                case ICMD_LSUBCONST:  /* ..., value  ==> ..., value - constant        */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO */
+                       /* else path can never happen? longs stay in memory! */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_alu_imm_membase(I386_SUB, iptr->val.l, REG_SP, iptr->dst->regoff * 8);
-                                               i386_alu_imm_membase(I386_SBB, iptr->val.l >> 32, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_alu_imm_membase(cd, ALU_SUB, iptr->val.l, REG_SP, iptr->dst->regoff * 4);
+                                               i386_alu_imm_membase(cd, ALU_SBB, iptr->val.l >> 32, REG_SP, iptr->dst->regoff * 4 + 4);
 
                                        } else {
                                                /* TODO: could be size optimized with lea -- see gcc output */
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                               i386_alu_imm_reg(I386_SUB, iptr->val.l, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                               i386_alu_imm_reg(I386_SBB, iptr->val.l >> 32, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                               i386_alu_imm_reg(cd, ALU_SUB, iptr->val.l, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                                               i386_alu_imm_reg(cd, ALU_SBB, iptr->val.l >> 32, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4 + 4);
                                        }
                                }
                        }
                        break;
 
                case ICMD_IMUL:       /* ..., val1, val2  ==> ..., val1 * val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO OUTPUT: EAX*/ /* EDX really not destroyed by IMUL? */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                       i386_imul_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                       i386_imul_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_imul_reg_reg(src->prev->regoff, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_imul_reg_reg(cd, src->prev->regoff, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                       i386_imul_reg_reg(src->regoff, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                       i386_imul_reg_reg(cd, src->regoff, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else {
-                                       i386_mov_reg_reg(src->prev->regoff, REG_ITMP1);
-                                       i386_imul_reg_reg(src->regoff, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_mov_reg_reg(cd, src->prev->regoff, REG_ITMP1);
+                                       i386_imul_reg_reg(cd, src->regoff, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, iptr->dst->regoff);
-                                       i386_imul_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
+                                       i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, iptr->dst->regoff);
+                                       i386_imul_membase_reg(cd, REG_SP, src->regoff * 4, iptr->dst->regoff);
 
                                } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
                                        M_INTMOVE(src->prev->regoff, iptr->dst->regoff);
-                                       i386_imul_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
+                                       i386_imul_membase_reg(cd, REG_SP, src->regoff * 4, iptr->dst->regoff);
 
                                } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
                                        M_INTMOVE(src->regoff, iptr->dst->regoff);
-                                       i386_imul_membase_reg(REG_SP, src->prev->regoff * 8, iptr->dst->regoff);
+                                       i386_imul_membase_reg(cd, REG_SP, src->prev->regoff * 4, iptr->dst->regoff);
 
                                } else {
                                        if (src->regoff == iptr->dst->regoff) {
-                                               i386_imul_reg_reg(src->prev->regoff, iptr->dst->regoff);
+                                               i386_imul_reg_reg(cd, src->prev->regoff, iptr->dst->regoff);
 
                                        } else {
                                                M_INTMOVE(src->prev->regoff, iptr->dst->regoff);
-                                               i386_imul_reg_reg(src->regoff, iptr->dst->regoff);
+                                               i386_imul_reg_reg(cd, src->regoff, iptr->dst->regoff);
                                        }
                                }
                        }
@@ -1613,109 +1450,108 @@ void codegen()
 
                case ICMD_IMULCONST:  /* ..., value  ==> ..., value * constant        */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: EAX*/ /* EDX really not destroyed by IMUL? */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
-                                       i386_imul_imm_membase_reg(iptr->val.i, REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_imul_imm_membase_reg(cd, iptr->val.i, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
 
                                } else {
-                                       i386_imul_imm_reg_reg(iptr->val.i, src->regoff, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                                       i386_imul_imm_reg_reg(cd, iptr->val.i, src->regoff, REG_ITMP1);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
                                }
 
                        } else {
                                if (src->flags & INMEMORY) {
-                                       i386_imul_imm_membase_reg(iptr->val.i, REG_SP, src->regoff * 8, iptr->dst->regoff);
+                                       i386_imul_imm_membase_reg(cd, iptr->val.i, REG_SP, src->regoff * 4, iptr->dst->regoff);
 
                                } else {
-                                       i386_imul_imm_reg_reg(iptr->val.i, src->regoff, iptr->dst->regoff);
+                                       i386_imul_imm_reg_reg(cd, iptr->val.i, src->regoff, iptr->dst->regoff);
                                }
                        }
                        break;
 
                case ICMD_LMUL:       /* ..., val1, val2  ==> ..., val1 * val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, EAX);             /* mem -> EAX             */
+                                       i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, EAX);             /* mem -> EAX             */
                                        /* optimize move EAX -> REG_ITMP3 is slower??? */
-/*                                     i386_mov_reg_reg(EAX, REG_ITMP3); */
-                                       i386_mul_membase(REG_SP, src->regoff * 8);                            /* mem * EAX -> EDX:EAX   */
+/*                                     i386_mov_reg_reg(cd, EAX, REG_ITMP3); */
+                                       i386_mul_membase(cd, REG_SP, src->regoff * 4);                            /* mem * EAX -> EDX:EAX   */
 
                                        /* TODO: optimize move EAX -> REG_ITMP3 */
-                                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP2);   /* mem -> ITMP3           */
-                                       i386_imul_membase_reg(REG_SP, src->regoff * 8, REG_ITMP2);            /* mem * ITMP3 -> ITMP3   */
-                                       i386_alu_reg_reg(I386_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
+                                       i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP2);   /* mem -> ITMP3           */
+                                       i386_imul_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP2);            /* mem * ITMP3 -> ITMP3   */
+                                       i386_alu_reg_reg(cd, ALU_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
 
-                                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP2);       /* mem -> ITMP3           */
-                                       i386_imul_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);        /* mem * ITMP3 -> ITMP3   */
+                                       i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP2);       /* mem -> ITMP3           */
+                                       i386_imul_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);        /* mem * ITMP3 -> ITMP3   */
 
-                                       i386_alu_reg_reg(I386_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
-                                       i386_mov_reg_membase(EAX, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_reg_membase(EDX, REG_SP, iptr->dst->regoff * 8 + 4);
+                                       i386_alu_reg_reg(cd, ALU_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
+                                       i386_mov_reg_membase(cd, EAX, REG_SP, iptr->dst->regoff * 4);
+                                       i386_mov_reg_membase(cd, EDX, REG_SP, iptr->dst->regoff * 4 + 4);
                                }
                        }
                        break;
 
                case ICMD_LMULCONST:  /* ..., value  ==> ..., value * constant        */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
-                                       i386_mov_imm_reg(iptr->val.l, EAX);                                   /* imm -> EAX             */
-                                       i386_mul_membase(REG_SP, src->regoff * 8);                            /* mem * EAX -> EDX:EAX   */
+                                       i386_mov_imm_reg(cd, iptr->val.l, EAX);                                   /* imm -> EAX             */
+                                       i386_mul_membase(cd, REG_SP, src->regoff * 4);                            /* mem * EAX -> EDX:EAX   */
                                        /* TODO: optimize move EAX -> REG_ITMP3 */
-                                       i386_mov_imm_reg(iptr->val.l >> 32, REG_ITMP2);                       /* imm -> ITMP3           */
-                                       i386_imul_membase_reg(REG_SP, src->regoff * 8, REG_ITMP2);            /* mem * ITMP3 -> ITMP3   */
+                                       i386_mov_imm_reg(cd, iptr->val.l >> 32, REG_ITMP2);                       /* imm -> ITMP3           */
+                                       i386_imul_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP2);            /* mem * ITMP3 -> ITMP3   */
 
-                                       i386_alu_reg_reg(I386_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
-                                       i386_mov_imm_reg(iptr->val.l, REG_ITMP2);                             /* imm -> ITMP3           */
-                                       i386_imul_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);        /* mem * ITMP3 -> ITMP3   */
+                                       i386_alu_reg_reg(cd, ALU_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
+                                       i386_mov_imm_reg(cd, iptr->val.l, REG_ITMP2);                             /* imm -> ITMP3           */
+                                       i386_imul_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);        /* mem * ITMP3 -> ITMP3   */
 
-                                       i386_alu_reg_reg(I386_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
-                                       i386_mov_reg_membase(EAX, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_reg_membase(EDX, REG_SP, iptr->dst->regoff * 8 + 4);
+                                       i386_alu_reg_reg(cd, ALU_ADD, REG_ITMP2, EDX);                      /* ITMP3 + EDX -> EDX     */
+                                       i386_mov_reg_membase(cd, EAX, REG_SP, iptr->dst->regoff * 4);
+                                       i386_mov_reg_membase(cd, EDX, REG_SP, iptr->dst->regoff * 4 + 4);
                                }
                        }
                        break;
 
-#define gen_div_check(v) \
-    if (checknull) { \
-        if ((v)->flags & INMEMORY) { \
-            i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8); \
-        } else { \
-            i386_test_reg_reg(src->regoff, src->regoff); \
-        } \
-        i386_jcc(I386_CC_E, 0); \
-        codegen_addxdivrefs(mcodeptr); \
-    }
-
                case ICMD_IDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: EAX */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        var_to_reg_int(s1, src, REG_ITMP2);
                        gen_div_check(src);
                if (src->prev->flags & INMEMORY) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, EAX);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, EAX);
 
                        } else {
                                M_INTMOVE(src->prev->regoff, EAX);
                        }
-                       
-                       i386_alu_imm_reg(I386_CMP, 0x80000000, EAX);    /* check as described in jvm spec */
-                       i386_jcc(I386_CC_NE, 3 + 6);
-                       i386_alu_imm_reg(I386_CMP, -1, s1);
-                       i386_jcc(I386_CC_E, 1 + 2);
 
-                       i386_cltd();
-                       i386_idiv_reg(s1);
+                       /* check as described in jvm spec */
+
+                       i386_alu_imm_reg(cd, ALU_CMP, 0x80000000, EAX);
+                       i386_jcc(cd, I386_CC_NE, 3 + 6);
+                       i386_alu_imm_reg(cd, ALU_CMP, -1, s1);
+                       i386_jcc(cd, I386_CC_E, 1 + 2);
+
+                       i386_cltd(cd);
+                       i386_idiv_reg(cd, s1);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_reg_membase(EAX, REG_SP, iptr->dst->regoff * 8);
+                               i386_mov_reg_membase(cd, EAX, REG_SP, iptr->dst->regoff * 4);
 
                        } else {
                                M_INTMOVE(EAX, iptr->dst->regoff);
@@ -1723,28 +1559,33 @@ void codegen()
                        break;
 
                case ICMD_IREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: EDX */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        var_to_reg_int(s1, src, REG_ITMP2);
                        gen_div_check(src);
                        if (src->prev->flags & INMEMORY) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, EAX);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, EAX);
 
                        } else {
                                M_INTMOVE(src->prev->regoff, EAX);
                        }
-                       
-                       i386_alu_imm_reg(I386_CMP, 0x80000000, EAX);    /* check as described in jvm spec */
-                       i386_jcc(I386_CC_NE, 2 + 3 + 6);
-                       i386_alu_reg_reg(I386_XOR, EDX, EDX);
-                       i386_alu_imm_reg(I386_CMP, -1, s1);
-                       i386_jcc(I386_CC_E, 1 + 2);
 
-                       i386_cltd();
-                       i386_idiv_reg(s1);
+                       /* check as described in jvm spec */
+
+                       i386_alu_imm_reg(cd, ALU_CMP, 0x80000000, EAX);
+                       i386_jcc(cd, I386_CC_NE, 2 + 3 + 6);
+                       i386_alu_reg_reg(cd, ALU_XOR, EDX, EDX);
+                       i386_alu_imm_reg(cd, ALU_CMP, -1, s1);
+                       i386_jcc(cd, I386_CC_E, 1 + 2);
+
+                       i386_cltd(cd);
+                       i386_idiv_reg(cd, s1);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_reg_membase(EDX, REG_SP, iptr->dst->regoff * 8);
+                               i386_mov_reg_membase(cd, EDX, REG_SP, iptr->dst->regoff * 4);
 
                        } else {
                                M_INTMOVE(EDX, iptr->dst->regoff);
@@ -1753,247 +1594,299 @@ void codegen()
 
                case ICMD_IDIVPOW2:   /* ..., value  ==> ..., value >> constant       */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL */
 
                        /* TODO: optimize for `/ 2' */
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
 
                        M_INTMOVE(s1, d);
-                       i386_test_reg_reg(d, d);
-                       a = 2;
-                       CALCIMMEDIATEBYTES(a, (1 << iptr->val.i) - 1);
-                       i386_jcc(I386_CC_NS, a);
-                       i386_alu_imm_reg(I386_ADD, (1 << iptr->val.i) - 1, d);
+                       i386_test_reg_reg(cd, d, d);
+                       disp = 2;
+                       CALCIMMEDIATEBYTES(disp, (1 << iptr->val.i) - 1);
+                       i386_jcc(cd, I386_CC_NS, disp);
+                       i386_alu_imm_reg(cd, ALU_ADD, (1 << iptr->val.i) - 1, d);
                                
-                       i386_shift_imm_reg(I386_SAR, iptr->val.i, d);
+                       i386_shift_imm_reg(cd, I386_SAR, iptr->val.i, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_LDIVPOW2:   /* ..., value  ==> ..., value >> constant       */
-                                     /* val.i = constant                             */
-
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       if (iptr->dst->flags & INMEMORY) {
-                               if (src->flags & INMEMORY) {
-                                       a = 2;
-                                       CALCIMMEDIATEBYTES(a, (1 << iptr->val.i) - 1);
-                                       a += 3;
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
-
-                                       i386_test_reg_reg(REG_ITMP2, REG_ITMP2);
-                                       i386_jcc(I386_CC_NS, a);
-                                       i386_alu_imm_reg(I386_ADD, (1 << iptr->val.i) - 1, REG_ITMP1);
-                                       i386_alu_imm_reg(I386_ADC, 0, REG_ITMP2);
-                                       i386_shrd_imm_reg_reg(iptr->val.i, REG_ITMP2, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SAR, iptr->val.i, REG_ITMP2);
-
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4);
-                               }
-                       }
-                       break;
-
                case ICMD_IREMPOW2:   /* ..., value  ==> ..., value % constant        */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: NO OUTPUT: REG_NULL */
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP2);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
                        if (s1 == d) {
                                M_INTMOVE(s1, REG_ITMP1);
                                s1 = REG_ITMP1;
                        } 
 
-                       a = 2;
-                       a += 2;
-                       a += 2;
-                       CALCIMMEDIATEBYTES(a, iptr->val.i);
-                       a += 2;
+                       disp = 2;
+                       disp += 2;
+                       disp += 2;
+                       CALCIMMEDIATEBYTES(disp, iptr->val.i);
+                       disp += 2;
 
                        /* TODO: optimize */
                        M_INTMOVE(s1, d);
-                       i386_alu_imm_reg(I386_AND, iptr->val.i, d);
-                       i386_test_reg_reg(s1, s1);
-                       i386_jcc(I386_CC_GE, a);
-                       i386_mov_reg_reg(s1, d);
-                       i386_neg_reg(d);
-                       i386_alu_imm_reg(I386_AND, iptr->val.i, d);
-                       i386_neg_reg(d);
+                       i386_alu_imm_reg(cd, ALU_AND, iptr->val.i, d);
+                       i386_test_reg_reg(cd, s1, s1);
+                       i386_jcc(cd, I386_CC_GE, disp);
+                       i386_mov_reg_reg(cd, s1, d);
+                       i386_neg_reg(cd, d);
+                       i386_alu_imm_reg(cd, ALU_AND, iptr->val.i, d);
+                       i386_neg_reg(cd, d);
 
 /*                     M_INTMOVE(s1, EAX); */
-/*                     i386_cltd(); */
-/*                     i386_alu_reg_reg(I386_XOR, EDX, EAX); */
-/*                     i386_alu_reg_reg(I386_SUB, EDX, EAX); */
-/*                     i386_alu_reg_reg(I386_AND, iptr->val.i, EAX); */
-/*                     i386_alu_reg_reg(I386_XOR, EDX, EAX); */
-/*                     i386_alu_reg_reg(I386_SUB, EDX, EAX); */
+/*                     i386_cltd(cd); */
+/*                     i386_alu_reg_reg(cd, ALU_XOR, EDX, EAX); */
+/*                     i386_alu_reg_reg(cd, ALU_SUB, EDX, EAX); */
+/*                     i386_alu_reg_reg(cd, ALU_AND, iptr->val.i, EAX); */
+/*                     i386_alu_reg_reg(cd, ALU_XOR, EDX, EAX); */
+/*                     i386_alu_reg_reg(cd, ALU_SUB, EDX, EAX); */
 /*                     M_INTMOVE(EAX, d); */
 
-/*                     i386_alu_reg_reg(I386_XOR, d, d); */
-/*                     i386_mov_imm_reg(iptr->val.i, ECX); */
-/*                     i386_shrd_reg_reg(s1, d); */
-/*                     i386_shift_imm_reg(I386_SHR, 32 - iptr->val.i, d); */
+/*                     i386_alu_reg_reg(cd, ALU_XOR, d, d); */
+/*                     i386_mov_imm_reg(cd, iptr->val.i, ECX); */
+/*                     i386_shrd_reg_reg(cd, s1, d); */
+/*                     i386_shift_imm_reg(cd, I386_SHR, 32 - iptr->val.i, d); */
 
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
+               case ICMD_LDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
+               case ICMD_LREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
+
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       M_ILD(REG_ITMP2, REG_SP, src->regoff * 4);
+                       M_OR_MEMBASE(REG_SP, src->regoff * 4 + 4, REG_ITMP2);
+                       M_TEST(REG_ITMP2);
+                       M_BEQ(0);
+                       codegen_addxdivrefs(cd, cd->mcodeptr);
+
+                       bte = iptr->val.a;
+                       md = bte->md;
+
+                       M_ILD(REG_ITMP1, REG_SP, src->prev->regoff * 4);
+                       M_ILD(REG_ITMP2, REG_SP, src->prev->regoff * 4 + 4);
+                       M_IST(REG_ITMP1, REG_SP, 0 * 4);
+                       M_IST(REG_ITMP2, REG_SP, 0 * 4 + 4);
+
+                       M_ILD(REG_ITMP1, REG_SP, src->regoff * 4);
+                       M_ILD(REG_ITMP2, REG_SP, src->regoff * 4 + 4);
+                       M_IST(REG_ITMP1, REG_SP, 2 * 4);
+                       M_IST(REG_ITMP2, REG_SP, 2 * 4 + 4);
+
+                       M_MOV_IMM((ptrint) bte->fp, REG_ITMP3);
+                       M_CALL(REG_ITMP3);
+
+                       M_IST(REG_RESULT, REG_SP, iptr->dst->regoff * 4);
+                       M_IST(REG_RESULT2, REG_SP, iptr->dst->regoff * 4 + 4);
+                       break;
+
+               case ICMD_LDIVPOW2:   /* ..., value  ==> ..., value >> constant       */
+                                     /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: NO OUTPUT: REG_NULL */
+
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       if (iptr->dst->flags & INMEMORY) {
+                               if (src->flags & INMEMORY) {
+                                       disp = 2;
+                                       CALCIMMEDIATEBYTES(disp, (1 << iptr->val.i) - 1);
+                                       disp += 3;
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
+
+                                       i386_test_reg_reg(cd, REG_ITMP2, REG_ITMP2);
+                                       i386_jcc(cd, I386_CC_NS, disp);
+                                       i386_alu_imm_reg(cd, ALU_ADD, (1 << iptr->val.i) - 1, REG_ITMP1);
+                                       i386_alu_imm_reg(cd, ALU_ADC, 0, REG_ITMP2);
+                                       i386_shrd_imm_reg_reg(cd, iptr->val.i, REG_ITMP2, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SAR, iptr->val.i, REG_ITMP2);
+
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                       i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4);
+                               }
+                       }
+                       break;
+
                case ICMD_LREMPOW2:   /* ..., value  ==> ..., value % constant        */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: NO OUTPUT: REG_NULL */
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY) {
                                if (src->flags & INMEMORY) {
                                        /* Intel algorithm -- does not work, because constant is wrong */
-/*                                     i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1); */
-/*                                     i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP3); */
+/*                                     i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1); */
+/*                                     i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP3); */
 
 /*                                     M_INTMOVE(REG_ITMP1, REG_ITMP2); */
-/*                                     i386_test_reg_reg(REG_ITMP3, REG_ITMP3); */
-/*                                     i386_jcc(I386_CC_NS, offset); */
-/*                                     i386_alu_imm_reg(I386_ADD, (1 << iptr->val.l) - 1, REG_ITMP2); */
-/*                                     i386_alu_imm_reg(I386_ADC, 0, REG_ITMP3); */
+/*                                     i386_test_reg_reg(cd, REG_ITMP3, REG_ITMP3); */
+/*                                     i386_jcc(cd, I386_CC_NS, offset); */
+/*                                     i386_alu_imm_reg(cd, ALU_ADD, (1 << iptr->val.l) - 1, REG_ITMP2); */
+/*                                     i386_alu_imm_reg(cd, ALU_ADC, 0, REG_ITMP3); */
                                        
-/*                                     i386_shrd_imm_reg_reg(iptr->val.l, REG_ITMP3, REG_ITMP2); */
-/*                                     i386_shift_imm_reg(I386_SAR, iptr->val.l, REG_ITMP3); */
-/*                                     i386_shld_imm_reg_reg(iptr->val.l, REG_ITMP2, REG_ITMP3); */
+/*                                     i386_shrd_imm_reg_reg(cd, iptr->val.l, REG_ITMP3, REG_ITMP2); */
+/*                                     i386_shift_imm_reg(cd, I386_SAR, iptr->val.l, REG_ITMP3); */
+/*                                     i386_shld_imm_reg_reg(cd, iptr->val.l, REG_ITMP2, REG_ITMP3); */
 
-/*                                     i386_shift_imm_reg(I386_SHL, iptr->val.l, REG_ITMP2); */
+/*                                     i386_shift_imm_reg(cd, I386_SHL, iptr->val.l, REG_ITMP2); */
 
-/*                                     i386_alu_reg_reg(I386_SUB, REG_ITMP2, REG_ITMP1); */
-/*                                     i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2); */
-/*                                     i386_alu_reg_reg(I386_SBB, REG_ITMP3, REG_ITMP2); */
+/*                                     i386_alu_reg_reg(cd, ALU_SUB, REG_ITMP2, REG_ITMP1); */
+/*                                     i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2); */
+/*                                     i386_alu_reg_reg(cd, ALU_SBB, REG_ITMP3, REG_ITMP2); */
 
-/*                                     i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8); */
-/*                                     i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4); */
+/*                                     i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4); */
+/*                                     i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4); */
 
                                        /* Alpha algorithm */
-                                       a = 3;
-                                       CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                                       a += 3;
-                                       CALCOFFSETBYTES(a, REG_SP, src->regoff * 8 + 4);
+                                       disp = 3;
+                                       CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                                       disp += 3;
+                                       CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4 + 4);
 
-                                       a += 2;
-                                       a += 3;
-                                       a += 2;
+                                       disp += 2;
+                                       disp += 3;
+                                       disp += 2;
 
                                        /* TODO: hmm, don't know if this is always correct */
-                                       a += 2;
-                                       CALCIMMEDIATEBYTES(a, iptr->val.l & 0x00000000ffffffff);
-                                       a += 2;
-                                       CALCIMMEDIATEBYTES(a, iptr->val.l >> 32);
+                                       disp += 2;
+                                       CALCIMMEDIATEBYTES(disp, iptr->val.l & 0x00000000ffffffff);
+                                       disp += 2;
+                                       CALCIMMEDIATEBYTES(disp, iptr->val.l >> 32);
 
-                                       a += 2;
-                                       a += 3;
-                                       a += 2;
+                                       disp += 2;
+                                       disp += 3;
+                                       disp += 2;
 
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
                                        
-                                       i386_alu_imm_reg(I386_AND, iptr->val.l, REG_ITMP1);
-                                       i386_alu_imm_reg(I386_AND, iptr->val.l >> 32, REG_ITMP2);
-                                       i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8 + 4);
-                                       i386_jcc(I386_CC_GE, a);
+                                       i386_alu_imm_reg(cd, ALU_AND, iptr->val.l, REG_ITMP1);
+                                       i386_alu_imm_reg(cd, ALU_AND, iptr->val.l >> 32, REG_ITMP2);
+                                       i386_alu_imm_membase(cd, ALU_CMP, 0, REG_SP, src->regoff * 4 + 4);
+                                       i386_jcc(cd, I386_CC_GE, disp);
 
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
                                        
-                                       i386_neg_reg(REG_ITMP1);
-                                       i386_alu_imm_reg(I386_ADC, 0, REG_ITMP2);
-                                       i386_neg_reg(REG_ITMP2);
+                                       i386_neg_reg(cd, REG_ITMP1);
+                                       i386_alu_imm_reg(cd, ALU_ADC, 0, REG_ITMP2);
+                                       i386_neg_reg(cd, REG_ITMP2);
                                        
-                                       i386_alu_imm_reg(I386_AND, iptr->val.l, REG_ITMP1);
-                                       i386_alu_imm_reg(I386_AND, iptr->val.l >> 32, REG_ITMP2);
+                                       i386_alu_imm_reg(cd, ALU_AND, iptr->val.l, REG_ITMP1);
+                                       i386_alu_imm_reg(cd, ALU_AND, iptr->val.l >> 32, REG_ITMP2);
                                        
-                                       i386_neg_reg(REG_ITMP1);
-                                       i386_alu_imm_reg(I386_ADC, 0, REG_ITMP2);
-                                       i386_neg_reg(REG_ITMP2);
+                                       i386_neg_reg(cd, REG_ITMP1);
+                                       i386_alu_imm_reg(cd, ALU_ADC, 0, REG_ITMP2);
+                                       i386_neg_reg(cd, REG_ITMP2);
 
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4);
+                                       i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                       i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4);
                                }
                        }
                        break;
 
                case ICMD_ISHL:       /* ..., val1, val2  ==> ..., val1 << val2       */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: D|S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ishift(I386_SHL, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ishift(cd, I386_SHL, src, iptr);
                        break;
 
                case ICMD_ISHLCONST:  /* ..., value  ==> ..., value << constant       */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ishiftconst(I386_SHL, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ishiftconst(cd, I386_SHL, src, iptr);
                        break;
 
                case ICMD_ISHR:       /* ..., val1, val2  ==> ..., val1 >> val2       */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: D|S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ishift(I386_SAR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ishift(cd, I386_SAR, src, iptr);
                        break;
 
                case ICMD_ISHRCONST:  /* ..., value  ==> ..., value >> constant       */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ishiftconst(I386_SAR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ishiftconst(cd, I386_SAR, src, iptr);
                        break;
 
                case ICMD_IUSHR:      /* ..., val1, val2  ==> ..., val1 >>> val2      */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: D|S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ishift(I386_SHR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ishift(cd, I386_SHR, src, iptr);
                        break;
 
                case ICMD_IUSHRCONST: /* ..., value  ==> ..., value >>> constant      */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ishiftconst(I386_SHR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ishiftconst(cd, I386_SHR, src, iptr);
                        break;
 
                case ICMD_LSHL:       /* ..., val1, val2  ==> ..., val1 << val2       */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY ){
                                if (src->prev->flags & INMEMORY) {
 /*                                     if (src->prev->regoff == iptr->dst->regoff) { */
-/*                                             i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1); */
+/*                                             i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1); */
 
 /*                                             if (src->flags & INMEMORY) { */
-/*                                                     i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX); */
+/*                                                     i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, ECX); */
 /*                                             } else { */
 /*                                                     M_INTMOVE(src->regoff, ECX); */
 /*                                             } */
 
-/*                                             i386_test_imm_reg(32, ECX); */
-/*                                             i386_jcc(I386_CC_E, 2 + 2); */
-/*                                             i386_mov_reg_reg(REG_ITMP1, REG_ITMP2); */
-/*                                             i386_alu_reg_reg(I386_XOR, REG_ITMP1, REG_ITMP1); */
+/*                                             i386_test_imm_reg(cd, 32, ECX); */
+/*                                             i386_jcc(cd, I386_CC_E, 2 + 2); */
+/*                                             i386_mov_reg_reg(cd, REG_ITMP1, REG_ITMP2); */
+/*                                             i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP1, REG_ITMP1); */
                                                
-/*                                             i386_shld_reg_membase(REG_ITMP1, REG_SP, src->prev->regoff * 8 + 4); */
-/*                                             i386_shift_membase(I386_SHL, REG_SP, iptr->dst->regoff * 8); */
+/*                                             i386_shld_reg_membase(cd, REG_ITMP1, REG_SP, src->prev->regoff * 4 + 4); */
+/*                                             i386_shift_membase(cd, I386_SHL, REG_SP, iptr->dst->regoff * 4); */
 
 /*                                     } else { */
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP3);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP3);
                                                
                                                if (src->flags & INMEMORY) {
-                                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
+                                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, ECX);
                                                } else {
                                                        M_INTMOVE(src->regoff, ECX);
                                                }
                                                
-                                               i386_test_imm_reg(32, ECX);
-                                               i386_jcc(I386_CC_E, 2 + 2);
-                                               i386_mov_reg_reg(REG_ITMP1, REG_ITMP3);
-                                               i386_alu_reg_reg(I386_XOR, REG_ITMP1, REG_ITMP1);
+                                               i386_test_imm_reg(cd, 32, ECX);
+                                               i386_jcc(cd, I386_CC_E, 2 + 2);
+                                               i386_mov_reg_reg(cd, REG_ITMP1, REG_ITMP3);
+                                               i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP1, REG_ITMP1);
                                                
-                                               i386_shld_reg_reg(REG_ITMP1, REG_ITMP3);
-                                               i386_shift_reg(I386_SHL, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_reg_membase(REG_ITMP3, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_shld_reg_reg(cd, REG_ITMP1, REG_ITMP3);
+                                               i386_shift_reg(cd, I386_SHL, REG_ITMP1);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_reg_membase(cd, REG_ITMP3, REG_SP, iptr->dst->regoff * 4 + 4);
 /*                                     } */
                                }
                        }
@@ -2001,72 +1894,76 @@ void codegen()
 
         case ICMD_LSHLCONST:  /* ..., value  ==> ..., value << constant       */
                                          /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY ) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
 
                                if (iptr->val.i & 0x20) {
-                                       i386_mov_reg_reg(REG_ITMP1, REG_ITMP2);
-                                       i386_alu_reg_reg(I386_XOR, REG_ITMP1, REG_ITMP1);
-                                       i386_shld_imm_reg_reg(iptr->val.i & 0x3f, REG_ITMP1, REG_ITMP2);
+                                       i386_mov_reg_reg(cd, REG_ITMP1, REG_ITMP2);
+                                       i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP1, REG_ITMP1);
+                                       i386_shld_imm_reg_reg(cd, iptr->val.i & 0x3f, REG_ITMP1, REG_ITMP2);
 
                                } else {
-                                       i386_shld_imm_reg_reg(iptr->val.i & 0x3f, REG_ITMP1, REG_ITMP2);
-                                       i386_shift_imm_reg(I386_SHL, iptr->val.i & 0x3f, REG_ITMP1);
+                                       i386_shld_imm_reg_reg(cd, iptr->val.i & 0x3f, REG_ITMP1, REG_ITMP2);
+                                       i386_shift_imm_reg(cd, I386_SHL, iptr->val.i & 0x3f, REG_ITMP1);
                                }
 
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                               i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4);
                        }
                        break;
 
                case ICMD_LSHR:       /* ..., val1, val2  ==> ..., val1 >> val2       */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: YES S|EDX: YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY ){
                                if (src->prev->flags & INMEMORY) {
 /*                                     if (src->prev->regoff == iptr->dst->regoff) { */
                                                /* TODO: optimize */
-/*                                             i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1); */
-/*                                             i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP2); */
+/*                                             i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1); */
+/*                                             i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP2); */
 
 /*                                             if (src->flags & INMEMORY) { */
-/*                                                     i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX); */
+/*                                                     i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, ECX); */
 /*                                             } else { */
 /*                                                     M_INTMOVE(src->regoff, ECX); */
 /*                                             } */
 
-/*                                             i386_test_imm_reg(32, ECX); */
-/*                                             i386_jcc(I386_CC_E, 2 + 3); */
-/*                                             i386_mov_reg_reg(REG_ITMP2, REG_ITMP1); */
-/*                                             i386_shift_imm_reg(I386_SAR, 31, REG_ITMP2); */
+/*                                             i386_test_imm_reg(cd, 32, ECX); */
+/*                                             i386_jcc(cd, I386_CC_E, 2 + 3); */
+/*                                             i386_mov_reg_reg(cd, REG_ITMP2, REG_ITMP1); */
+/*                                             i386_shift_imm_reg(cd, I386_SAR, 31, REG_ITMP2); */
                                                
-/*                                             i386_shrd_reg_reg(REG_ITMP2, REG_ITMP1); */
-/*                                             i386_shift_reg(I386_SAR, REG_ITMP2); */
-/*                                             i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8); */
-/*                                             i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4); */
+/*                                             i386_shrd_reg_reg(cd, REG_ITMP2, REG_ITMP1); */
+/*                                             i386_shift_reg(cd, I386_SAR, REG_ITMP2); */
+/*                                             i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4); */
+/*                                             i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4); */
 
 /*                                     } else { */
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP3);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP3);
 
                                                if (src->flags & INMEMORY) {
-                                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
+                                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, ECX);
                                                } else {
                                                        M_INTMOVE(src->regoff, ECX);
                                                }
 
-                                               i386_test_imm_reg(32, ECX);
-                                               i386_jcc(I386_CC_E, 2 + 3);
-                                               i386_mov_reg_reg(REG_ITMP3, REG_ITMP1);
-                                               i386_shift_imm_reg(I386_SAR, 31, REG_ITMP3);
+                                               i386_test_imm_reg(cd, 32, ECX);
+                                               i386_jcc(cd, I386_CC_E, 2 + 3);
+                                               i386_mov_reg_reg(cd, REG_ITMP3, REG_ITMP1);
+                                               i386_shift_imm_reg(cd, I386_SAR, 31, REG_ITMP3);
                                                
-                                               i386_shrd_reg_reg(REG_ITMP3, REG_ITMP1);
-                                               i386_shift_reg(I386_SAR, REG_ITMP3);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_reg_membase(REG_ITMP3, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_shrd_reg_reg(cd, REG_ITMP3, REG_ITMP1);
+                                               i386_shift_reg(cd, I386_SAR, REG_ITMP3);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_reg_membase(cd, REG_ITMP3, REG_SP, iptr->dst->regoff * 4 + 4);
 /*                                     } */
                                }
                        }
@@ -2074,72 +1971,76 @@ void codegen()
 
                case ICMD_LSHRCONST:  /* ..., value  ==> ..., value >> constant       */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY ) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
 
                                if (iptr->val.i & 0x20) {
-                                       i386_mov_reg_reg(REG_ITMP2, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SAR, 31, REG_ITMP2);
-                                       i386_shrd_imm_reg_reg(iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
+                                       i386_mov_reg_reg(cd, REG_ITMP2, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SAR, 31, REG_ITMP2);
+                                       i386_shrd_imm_reg_reg(cd, iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
 
                                } else {
-                                       i386_shrd_imm_reg_reg(iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SAR, iptr->val.i & 0x3f, REG_ITMP2);
+                                       i386_shrd_imm_reg_reg(cd, iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SAR, iptr->val.i & 0x3f, REG_ITMP2);
                                }
 
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                               i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4);
                        }
                        break;
 
                case ICMD_LUSHR:      /* ..., val1, val2  ==> ..., val1 >>> val2      */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY ){
                                if (src->prev->flags & INMEMORY) {
 /*                                     if (src->prev->regoff == iptr->dst->regoff) { */
                                                /* TODO: optimize */
-/*                                             i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1); */
-/*                                             i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP2); */
+/*                                             i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1); */
+/*                                             i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP2); */
 
 /*                                             if (src->flags & INMEMORY) { */
-/*                                                     i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX); */
+/*                                                     i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, ECX); */
 /*                                             } else { */
 /*                                                     M_INTMOVE(src->regoff, ECX); */
 /*                                             } */
 
-/*                                             i386_test_imm_reg(32, ECX); */
-/*                                             i386_jcc(I386_CC_E, 2 + 2); */
-/*                                             i386_mov_reg_reg(REG_ITMP2, REG_ITMP1); */
-/*                                             i386_alu_reg_reg(I386_XOR, REG_ITMP2, REG_ITMP2); */
+/*                                             i386_test_imm_reg(cd, 32, ECX); */
+/*                                             i386_jcc(cd, I386_CC_E, 2 + 2); */
+/*                                             i386_mov_reg_reg(cd, REG_ITMP2, REG_ITMP1); */
+/*                                             i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP2, REG_ITMP2); */
                                                
-/*                                             i386_shrd_reg_reg(REG_ITMP2, REG_ITMP1); */
-/*                                             i386_shift_reg(I386_SHR, REG_ITMP2); */
-/*                                             i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8); */
-/*                                             i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4); */
+/*                                             i386_shrd_reg_reg(cd, REG_ITMP2, REG_ITMP1); */
+/*                                             i386_shift_reg(cd, I386_SHR, REG_ITMP2); */
+/*                                             i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4); */
+/*                                             i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4); */
 
 /*                                     } else { */
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP3);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP3);
 
                                                if (src->flags & INMEMORY) {
-                                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
+                                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, ECX);
                                                } else {
                                                        M_INTMOVE(src->regoff, ECX);
                                                }
 
-                                               i386_test_imm_reg(32, ECX);
-                                               i386_jcc(I386_CC_E, 2 + 2);
-                                               i386_mov_reg_reg(REG_ITMP3, REG_ITMP1);
-                                               i386_alu_reg_reg(I386_XOR, REG_ITMP3, REG_ITMP3);
+                                               i386_test_imm_reg(cd, 32, ECX);
+                                               i386_jcc(cd, I386_CC_E, 2 + 2);
+                                               i386_mov_reg_reg(cd, REG_ITMP3, REG_ITMP1);
+                                               i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP3, REG_ITMP3);
                                                
-                                               i386_shrd_reg_reg(REG_ITMP3, REG_ITMP1);
-                                               i386_shift_reg(I386_SHR, REG_ITMP3);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                               i386_mov_reg_membase(REG_ITMP3, REG_SP, iptr->dst->regoff * 8 + 4);
+                                               i386_shrd_reg_reg(cd, REG_ITMP3, REG_ITMP1);
+                                               i386_shift_reg(cd, I386_SHR, REG_ITMP3);
+                                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                                               i386_mov_reg_membase(cd, REG_ITMP3, REG_SP, iptr->dst->regoff * 4 + 4);
 /*                                     } */
                                }
                        }
@@ -2147,130 +2048,144 @@ void codegen()
 
                case ICMD_LUSHRCONST: /* ..., value  ==> ..., value >>> constant      */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
                        if (iptr->dst->flags & INMEMORY ) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
 
                                if (iptr->val.i & 0x20) {
-                                       i386_mov_reg_reg(REG_ITMP2, REG_ITMP1);
-                                       i386_alu_reg_reg(I386_XOR, REG_ITMP2, REG_ITMP2);
-                                       i386_shrd_imm_reg_reg(iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
+                                       i386_mov_reg_reg(cd, REG_ITMP2, REG_ITMP1);
+                                       i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP2, REG_ITMP2);
+                                       i386_shrd_imm_reg_reg(cd, iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
 
                                } else {
-                                       i386_shrd_imm_reg_reg(iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
-                                       i386_shift_imm_reg(I386_SHR, iptr->val.i & 0x3f, REG_ITMP2);
+                                       i386_shrd_imm_reg_reg(cd, iptr->val.i & 0x3f, REG_ITMP2, REG_ITMP1);
+                                       i386_shift_imm_reg(cd, I386_SHR, iptr->val.i & 0x3f, REG_ITMP2);
                                }
 
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_mov_reg_membase(cd, REG_ITMP1, REG_SP, iptr->dst->regoff * 4);
+                               i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4 + 4);
                        }
                        break;
 
                case ICMD_IAND:       /* ..., val1, val2  ==> ..., val1 & val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialu(I386_AND, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialu(cd, ALU_AND, src, iptr);
                        break;
 
                case ICMD_IANDCONST:  /* ..., value  ==> ..., value & constant        */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialuconst(I386_AND, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialuconst(cd, ALU_AND, src, iptr);
                        break;
 
                case ICMD_LAND:       /* ..., val1, val2  ==> ..., val1 & val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_lalu(I386_AND, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_lalu(cd, ALU_AND, src, iptr);
                        break;
 
                case ICMD_LANDCONST:  /* ..., value  ==> ..., value & constant        */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_laluconst(I386_AND, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_laluconst(cd, ALU_AND, src, iptr);
                        break;
 
                case ICMD_IOR:        /* ..., val1, val2  ==> ..., val1 | val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialu(I386_OR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialu(cd, ALU_OR, src, iptr);
                        break;
 
                case ICMD_IORCONST:   /* ..., value  ==> ..., value | constant        */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialuconst(I386_OR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialuconst(cd, ALU_OR, src, iptr);
                        break;
 
                case ICMD_LOR:        /* ..., val1, val2  ==> ..., val1 | val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_lalu(I386_OR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_lalu(cd, ALU_OR, src, iptr);
                        break;
 
                case ICMD_LORCONST:   /* ..., value  ==> ..., value | constant        */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_laluconst(I386_OR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_laluconst(cd, ALU_OR, src, iptr);
                        break;
 
                case ICMD_IXOR:       /* ..., val1, val2  ==> ..., val1 ^ val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialu(I386_XOR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialu(cd, ALU_XOR, src, iptr);
                        break;
 
                case ICMD_IXORCONST:  /* ..., value  ==> ..., value ^ constant        */
                                      /* val.i = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ialuconst(I386_XOR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ialuconst(cd, ALU_XOR, src, iptr);
                        break;
 
                case ICMD_LXOR:       /* ..., val1, val2  ==> ..., val1 ^ val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_lalu(I386_XOR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_lalu(cd, ALU_XOR, src, iptr);
                        break;
 
                case ICMD_LXORCONST:  /* ..., value  ==> ..., value ^ constant        */
                                      /* val.l = constant                             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_laluconst(I386_XOR, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_laluconst(cd, ALU_XOR, src, iptr);
                        break;
 
                case ICMD_IINC:       /* ..., value  ==> ..., value + constant        */
                                      /* op1 = variable, val.i = constant             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL */
 
-                       var = &(locals[iptr->op1][TYPE_INT]);
-                       if (var->flags & INMEMORY) {
-                               if (iptr->val.i == 1) {
-                                       i386_inc_membase(REG_SP, var->regoff * 8);
-                               } else if (iptr->val.i == -1) {
-                                       i386_dec_membase(REG_SP, var->regoff * 8);
-
-                               } else {
-                                       i386_alu_imm_membase(I386_ADD, iptr->val.i, REG_SP, var->regoff * 8);
-                               }
-
-                       } else {
-                               if (iptr->val.i == 1) {
-                                       i386_inc_reg(var->regoff);
-                               } else if (iptr->val.i == -1) {
-                                       i386_dec_reg(var->regoff);
-
-                               } else {
-                                       i386_alu_imm_reg(I386_ADD, iptr->val.i, var->regoff);
-                               }
+                       var = &(rd->locals[iptr->op1][TYPE_INT]);
+                       if (var->flags & INMEMORY)
+                               M_IADD_IMM_MEMBASE(iptr->val.i, REG_SP, var->regoff * 4);
+                       else {
+                               /* `inc reg' is slower on p4's (regarding to ia32
+                                  optimization reference manual and benchmarks) and
+                                  as fast on athlon's. */
+                               M_IADD_IMM(iptr->val.i, var->regoff);
                        }
                        break;
 
@@ -2278,22 +2193,22 @@ void codegen()
                /* floating operations ************************************************/
 #if 0
 #define ROUND_TO_SINGLE \
-                       i386_fstps_membase(REG_SP, -8); \
-                       i386_flds_membase(REG_SP, -8);
+                       i386_fstps_membase(cd, REG_SP, -8); \
+                       i386_flds_membase(cd, REG_SP, -8);
 
 #define ROUND_TO_DOUBLE \
-                       i386_fstpl_membase(REG_SP, -8); \
-                       i386_fldl_membase(REG_SP, -8);
+                       i386_fstpl_membase(cd, REG_SP, -8); \
+                       i386_fldl_membase(cd, REG_SP, -8);
 
 #define FPU_SET_24BIT_MODE \
                        if (!fpu_in_24bit_mode) { \
-                               i386_fldcw_mem(&fpu_ctrlwrd_24bit); \
+                               i386_fldcw_mem(cd, &fpu_ctrlwrd_24bit); \
                                fpu_in_24bit_mode = 1; \
                        }
 
 #define FPU_SET_53BIT_MODE \
                        if (fpu_in_24bit_mode) { \
-                               i386_fldcw_mem(&fpu_ctrlwrd_53bit); \
+                               i386_fldcw_mem(cd, &fpu_ctrlwrd_53bit); \
                                fpu_in_24bit_mode = 0; \
                        }
 #else
@@ -2303,183 +2218,209 @@ void codegen()
 #define FPU_SET_53BIT_MODE
 #endif
                case ICMD_FNEG:       /* ..., value  ==> ..., - value                 */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_24BIT_MODE;
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
-                       i386_fchs();
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       i386_fchs(cd);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_DNEG:       /* ..., value  ==> ..., - value                 */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_53BIT_MODE;
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
-                       i386_fchs();
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       i386_fchs(cd);
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_FADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_24BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       i386_faddp();
+                       i386_faddp(cd);
                        fpu_st_offset--;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_DADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_53BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       i386_faddp();
+                       i386_faddp(cd);
                        fpu_st_offset--;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_FSUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_24BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       i386_fsubp();
+                       i386_fsubp(cd);
                        fpu_st_offset--;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_DSUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_53BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       i386_fsubp();
+                       i386_fsubp(cd);
                        fpu_st_offset--;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_FMUL:       /* ..., val1, val2  ==> ..., val1 * val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_24BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       i386_fmulp();
+                       i386_fmulp(cd);
                        fpu_st_offset--;
                        ROUND_TO_SINGLE;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_DMUL:       /* ..., val1, val2  ==> ..., val1 * val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_53BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
 
-/*                     i386_fldt_mem(subnormal_bias1); */
-/*                     i386_fmulp(); */
+/*                     i386_fldt_mem(cd, subnormal_bias1); */
+/*                     i386_fmulp(cd); */
 
                        var_to_reg_flt(s2, src, REG_FTMP2);
 
-                       i386_fmulp();
+                       i386_fmulp(cd);
                        fpu_st_offset--;
 
-/*                     i386_fldt_mem(subnormal_bias2); */
-/*                     i386_fmulp(); */
+/*                     i386_fldt_mem(cd, subnormal_bias2); */
+/*                     i386_fmulp(cd); */
 
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_FDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_24BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
                        var_to_reg_flt(s2, src, REG_FTMP2);
-                       i386_fdivp();
+                       i386_fdivp(cd);
                        fpu_st_offset--;
                        ROUND_TO_SINGLE;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_DDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_53BIT_MODE;
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
 
-/*                     i386_fldt_mem(subnormal_bias1); */
-/*                     i386_fmulp(); */
+/*                     i386_fldt_mem(cd, subnormal_bias1); */
+/*                     i386_fmulp(cd); */
 
                        var_to_reg_flt(s2, src, REG_FTMP2);
 
-                       i386_fdivp();
+                       i386_fdivp(cd);
                        fpu_st_offset--;
 
-/*                     i386_fldt_mem(subnormal_bias2); */
-/*                     i386_fmulp(); */
+/*                     i386_fldt_mem(cd, subnormal_bias2); */
+/*                     i386_fmulp(cd); */
 
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_FREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_24BIT_MODE;
                        /* exchanged to skip fxch */
                        var_to_reg_flt(s2, src, REG_FTMP2);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
-/*                     i386_fxch(); */
-                       i386_fprem();
-                       i386_wait();
-                       i386_fnstsw();
-                       i386_sahf();
-                       i386_jcc(I386_CC_P, -(2 + 1 + 2 + 1 + 6));
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+/*                     i386_fxch(cd); */
+                       i386_fprem(cd);
+                       i386_wait(cd);
+                       i386_fnstsw(cd);
+                       i386_sahf(cd);
+                       i386_jcc(cd, I386_CC_P, -(2 + 1 + 2 + 1 + 6));
                        store_reg_to_var_flt(iptr->dst, d);
-                       i386_ffree_reg(0);
-                       i386_fincstp();
+                       i386_ffree_reg(cd, 0);
+                       i386_fincstp(cd);
                        fpu_st_offset--;
                        break;
 
                case ICMD_DREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        FPU_SET_53BIT_MODE;
                        /* exchanged to skip fxch */
                        var_to_reg_flt(s2, src, REG_FTMP2);
                        var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
-/*                     i386_fxch(); */
-                       i386_fprem();
-                       i386_wait();
-                       i386_fnstsw();
-                       i386_sahf();
-                       i386_jcc(I386_CC_P, -(2 + 1 + 2 + 1 + 6));
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+/*                     i386_fxch(cd); */
+                       i386_fprem(cd);
+                       i386_wait(cd);
+                       i386_fnstsw(cd);
+                       i386_sahf(cd);
+                       i386_jcc(cd, I386_CC_P, -(2 + 1 + 2 + 1 + 6));
                        store_reg_to_var_flt(iptr->dst, d);
-                       i386_ffree_reg(0);
-                       i386_fincstp();
+                       i386_ffree_reg(cd, 0);
+                       i386_fincstp(cd);
                        fpu_st_offset--;
                        break;
 
                case ICMD_I2F:       /* ..., value  ==> ..., (float) value            */
                case ICMD_I2D:       /* ..., value  ==> ..., (double) value           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_FTMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if (src->flags & INMEMORY) {
-                               i386_fildl_membase(REG_SP, src->regoff * 8);
+                               i386_fildl_membase(cd, REG_SP, src->regoff * 4);
                                fpu_st_offset++;
 
                        } else {
-                               a = dseg_adds4(0);
-                               i386_mov_imm_reg(0, REG_ITMP1);
-                               dseg_adddata(mcodeptr);
-                               i386_mov_reg_membase(src->regoff, REG_ITMP1, a);
-                               i386_fildl_membase(REG_ITMP1, a);
+                               disp = dseg_adds4(cd, 0);
+                               i386_mov_imm_reg(cd, 0, REG_ITMP1);
+                               dseg_adddata(cd, cd->mcodeptr);
+                               i386_mov_reg_membase(cd, src->regoff, REG_ITMP1, disp);
+                               i386_fildl_membase(cd, REG_ITMP1, disp);
                                fpu_st_offset++;
                        }
                        store_reg_to_var_flt(iptr->dst, d);
@@ -2487,67 +2428,76 @@ void codegen()
 
                case ICMD_L2F:       /* ..., value  ==> ..., (float) value            */
                case ICMD_L2D:       /* ..., value  ==> ..., (double) value           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_FTMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if (src->flags & INMEMORY) {
-                               i386_fildll_membase(REG_SP, src->regoff * 8);
+                               i386_fildll_membase(cd, REG_SP, src->regoff * 4);
                                fpu_st_offset++;
 
                        } else {
-                               panic("L2F: longs have to be in memory");
+                               log_text("L2F: longs have to be in memory");
+                               assert(0);
                        }
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
                        
                case ICMD_F2I:       /* ..., value  ==> ..., (int) value              */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: D|YES ECX: NO EDX: NO OUTPUT: EAX*/ 
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+
+                       i386_mov_imm_reg(cd, 0, REG_ITMP1);
+                       dseg_adddata(cd, cd->mcodeptr);
 
-                       a = dseg_adds4(0x0e7f);    /* Round to zero, 53-bit mode, exception masked */
-                       i386_mov_imm_reg(0, REG_ITMP1);
-                       dseg_adddata(mcodeptr);
-                       i386_fldcw_membase(REG_ITMP1, a);
+                       /* Round to zero, 53-bit mode, exception masked */
+                       disp = dseg_adds4(cd, 0x0e7f);
+                       i386_fldcw_membase(cd, REG_ITMP1, disp);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_fistpl_membase(REG_SP, iptr->dst->regoff * 8);
+                               i386_fistpl_membase(cd, REG_SP, iptr->dst->regoff * 4);
                                fpu_st_offset--;
 
-                               a = dseg_adds4(0x027f);    /* Round to nearest, 53-bit mode, exceptions masked */
-                               i386_fldcw_membase(REG_ITMP1, a);
+                               /* Round to nearest, 53-bit mode, exceptions masked */
+                               disp = dseg_adds4(cd, 0x027f);
+                               i386_fldcw_membase(cd, REG_ITMP1, disp);
 
-                               i386_alu_imm_membase(I386_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 4);
 
-                               a = 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2 + 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
+                               disp = 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2 + 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
 
                        } else {
-                               a = dseg_adds4(0);
-                               i386_fistpl_membase(REG_ITMP1, a);
+                               disp = dseg_adds4(cd, 0);
+                               i386_fistpl_membase(cd, REG_ITMP1, disp);
                                fpu_st_offset--;
-                               i386_mov_membase_reg(REG_ITMP1, a, iptr->dst->regoff);
+                               i386_mov_membase_reg(cd, REG_ITMP1, disp, iptr->dst->regoff);
 
-                               a = dseg_adds4(0x027f);    /* Round to nearest, 53-bit mode, exceptions masked */
-                               i386_fldcw_membase(REG_ITMP1, a);
+                               /* Round to nearest, 53-bit mode, exceptions masked */
+                               disp = dseg_adds4(cd, 0x027f);
+                               i386_fldcw_membase(cd, REG_ITMP1, disp);
 
-                               i386_alu_imm_reg(I386_CMP, 0x80000000, iptr->dst->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, 0x80000000, iptr->dst->regoff);
 
-                               a = 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2 + ((REG_RESULT == iptr->dst->regoff) ? 0 : 2);
+                               disp = 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2 + ((REG_RESULT == iptr->dst->regoff) ? 0 : 2);
                        }
 
-                       i386_jcc(I386_CC_NE, a);
+                       i386_jcc(cd, I386_CC_NE, disp);
 
                        /* XXX: change this when we use registers */
-                       i386_flds_membase(REG_SP, src->regoff * 8);
-                       i386_mov_imm_reg((s4) asm_builtin_f2i, REG_ITMP1);
-                       i386_call_reg(REG_ITMP1);
+                       i386_flds_membase(cd, REG_SP, src->regoff * 4);
+                       i386_mov_imm_reg(cd, (ptrint) asm_builtin_f2i, REG_ITMP1);
+                       i386_call_reg(cd, REG_ITMP1);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_reg_membase(REG_RESULT, REG_SP, iptr->dst->regoff * 8);
+                               i386_mov_reg_membase(cd, REG_RESULT, REG_SP, iptr->dst->regoff * 4);
 
                        } else {
                                M_INTMOVE(REG_RESULT, iptr->dst->regoff);
@@ -2555,371 +2505,398 @@ void codegen()
                        break;
 
                case ICMD_D2I:       /* ..., value  ==> ..., (int) value              */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: D|YES ECX: NO EDX: NO OUTPUT: EAX*/ 
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
 
-                       a = dseg_adds4(0x0e7f);    /* Round to zero, 53-bit mode, exception masked */
-                       i386_mov_imm_reg(0, REG_ITMP1);
-                       dseg_adddata(mcodeptr);
-                       i386_fldcw_membase(REG_ITMP1, a);
+                       i386_mov_imm_reg(cd, 0, REG_ITMP1);
+                       dseg_adddata(cd, cd->mcodeptr);
+
+                       /* Round to zero, 53-bit mode, exception masked */
+                       disp = dseg_adds4(cd, 0x0e7f);
+                       i386_fldcw_membase(cd, REG_ITMP1, disp);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_fistpl_membase(REG_SP, iptr->dst->regoff * 8);
+                               i386_fistpl_membase(cd, REG_SP, iptr->dst->regoff * 4);
                                fpu_st_offset--;
 
-                               a = dseg_adds4(0x027f);    /* Round to nearest, 53-bit mode, exceptions masked */
-                               i386_fldcw_membase(REG_ITMP1, a);
+                               /* Round to nearest, 53-bit mode, exceptions masked */
+                               disp = dseg_adds4(cd, 0x027f);
+                               i386_fldcw_membase(cd, REG_ITMP1, disp);
 
-                               i386_alu_imm_membase(I386_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 4);
 
-                               a = 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2 + 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
+                               disp = 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2 + 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
 
                        } else {
-                               a = dseg_adds4(0);
-                               i386_fistpl_membase(REG_ITMP1, a);
+                               disp = dseg_adds4(cd, 0);
+                               i386_fistpl_membase(cd, REG_ITMP1, disp);
                                fpu_st_offset--;
-                               i386_mov_membase_reg(REG_ITMP1, a, iptr->dst->regoff);
+                               i386_mov_membase_reg(cd, REG_ITMP1, disp, iptr->dst->regoff);
 
-                               a = dseg_adds4(0x027f);    /* Round to nearest, 53-bit mode, exceptions masked */
-                               i386_fldcw_membase(REG_ITMP1, a);
+                               /* Round to nearest, 53-bit mode, exceptions masked */
+                               disp = dseg_adds4(cd, 0x027f);
+                               i386_fldcw_membase(cd, REG_ITMP1, disp);
 
-                               i386_alu_imm_reg(I386_CMP, 0x80000000, iptr->dst->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, 0x80000000, iptr->dst->regoff);
 
-                               a = 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2 + ((REG_RESULT == iptr->dst->regoff) ? 0 : 2);
+                               disp = 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2 + ((REG_RESULT == iptr->dst->regoff) ? 0 : 2);
                        }
 
-                       i386_jcc(I386_CC_NE, a);
+                       i386_jcc(cd, I386_CC_NE, disp);
 
                        /* XXX: change this when we use registers */
-                       i386_fldl_membase(REG_SP, src->regoff * 8);
-                       i386_mov_imm_reg((s4) asm_builtin_d2i, REG_ITMP1);
-                       i386_call_reg(REG_ITMP1);
+                       i386_fldl_membase(cd, REG_SP, src->regoff * 4);
+                       i386_mov_imm_reg(cd, (ptrint) asm_builtin_d2i, REG_ITMP1);
+                       i386_call_reg(cd, REG_ITMP1);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_reg_membase(REG_RESULT, REG_SP, iptr->dst->regoff * 8);
+                               i386_mov_reg_membase(cd, REG_RESULT, REG_SP, iptr->dst->regoff * 4);
                        } else {
                                M_INTMOVE(REG_RESULT, iptr->dst->regoff);
                        }
                        break;
 
                case ICMD_F2L:       /* ..., value  ==> ..., (long) value             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: YES OUTPUT: REG_NULL*/ 
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+
+                       i386_mov_imm_reg(cd, 0, REG_ITMP1);
+                       dseg_adddata(cd, cd->mcodeptr);
 
-                       a = dseg_adds4(0x0e7f);    /* Round to zero, 53-bit mode, exception masked */
-                       i386_mov_imm_reg(0, REG_ITMP1);
-                       dseg_adddata(mcodeptr);
-                       i386_fldcw_membase(REG_ITMP1, a);
+                       /* Round to zero, 53-bit mode, exception masked */
+                       disp = dseg_adds4(cd, 0x0e7f);
+                       i386_fldcw_membase(cd, REG_ITMP1, disp);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_fistpll_membase(REG_SP, iptr->dst->regoff * 8);
+                               i386_fistpll_membase(cd, REG_SP, iptr->dst->regoff * 4);
                                fpu_st_offset--;
 
-                               a = dseg_adds4(0x027f);    /* Round to nearest, 53-bit mode, exceptions masked */
-                               i386_fldcw_membase(REG_ITMP1, a);
+                               /* Round to nearest, 53-bit mode, exceptions masked */
+                               disp = dseg_adds4(cd, 0x027f);
+                               i386_fldcw_membase(cd, REG_ITMP1, disp);
 
-                               i386_alu_imm_membase(I386_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_alu_imm_membase(cd, ALU_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 4 + 4);
 
-                               a = 6 + 4;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
-                               a += 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2;
-                               a += 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
-                               a += 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8 + 4);
+                               disp = 6 + 4;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
+                               disp += 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2;
+                               disp += 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
+                               disp += 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4 + 4);
 
-                               i386_jcc(I386_CC_NE, a);
+                               i386_jcc(cd, I386_CC_NE, disp);
 
-                               i386_alu_imm_membase(I386_CMP, 0, REG_SP, iptr->dst->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, 0, REG_SP, iptr->dst->regoff * 4);
 
-                               a = 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2 + 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
+                               disp = 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2 + 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
 
-                               i386_jcc(I386_CC_NE, a);
+                               i386_jcc(cd, I386_CC_NE, disp);
 
                                /* XXX: change this when we use registers */
-                               i386_flds_membase(REG_SP, src->regoff * 8);
-                               i386_mov_imm_reg((s4) asm_builtin_f2l, REG_ITMP1);
-                               i386_call_reg(REG_ITMP1);
-                               i386_mov_reg_membase(REG_RESULT, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_reg_membase(REG_RESULT2, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_flds_membase(cd, REG_SP, src->regoff * 4);
+                               i386_mov_imm_reg(cd, (ptrint) asm_builtin_f2l, REG_ITMP1);
+                               i386_call_reg(cd, REG_ITMP1);
+                               i386_mov_reg_membase(cd, REG_RESULT, REG_SP, iptr->dst->regoff * 4);
+                               i386_mov_reg_membase(cd, REG_RESULT2, REG_SP, iptr->dst->regoff * 4 + 4);
 
                        } else {
-                               panic("F2L: longs have to be in memory");
+                               log_text("F2L: longs have to be in memory");
+                               assert(0);
                        }
                        break;
 
                case ICMD_D2L:       /* ..., value  ==> ..., (long) value             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: YES OUTPUT: REG_NULL*/ 
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_NULL);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
 
-                       a = dseg_adds4(0x0e7f);    /* Round to zero, 53-bit mode, exception masked */
-                       i386_mov_imm_reg(0, REG_ITMP1);
-                       dseg_adddata(mcodeptr);
-                       i386_fldcw_membase(REG_ITMP1, a);
+                       i386_mov_imm_reg(cd, 0, REG_ITMP1);
+                       dseg_adddata(cd, cd->mcodeptr);
+
+                       /* Round to zero, 53-bit mode, exception masked */
+                       disp = dseg_adds4(cd, 0x0e7f);
+                       i386_fldcw_membase(cd, REG_ITMP1, disp);
 
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_fistpll_membase(REG_SP, iptr->dst->regoff * 8);
+                               i386_fistpll_membase(cd, REG_SP, iptr->dst->regoff * 4);
                                fpu_st_offset--;
 
-                               a = dseg_adds4(0x027f);    /* Round to nearest, 53-bit mode, exceptions masked */
-                               i386_fldcw_membase(REG_ITMP1, a);
+                               /* Round to nearest, 53-bit mode, exceptions masked */
+                               disp = dseg_adds4(cd, 0x027f);
+                               i386_fldcw_membase(cd, REG_ITMP1, disp);
 
-                               i386_alu_imm_membase(I386_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_alu_imm_membase(cd, ALU_CMP, 0x80000000, REG_SP, iptr->dst->regoff * 4 + 4);
 
-                               a = 6 + 4;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
-                               a += 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2;
-                               a += 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
-                               a += 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8 + 4);
+                               disp = 6 + 4;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
+                               disp += 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2;
+                               disp += 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
+                               disp += 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4 + 4);
 
-                               i386_jcc(I386_CC_NE, a);
+                               i386_jcc(cd, I386_CC_NE, disp);
 
-                               i386_alu_imm_membase(I386_CMP, 0, REG_SP, iptr->dst->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, 0, REG_SP, iptr->dst->regoff * 4);
 
-                               a = 3;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               a += 5 + 2 + 3;
-                               CALCOFFSETBYTES(a, REG_SP, iptr->dst->regoff * 8);
+                               disp = 3;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               disp += 5 + 2 + 3;
+                               CALCOFFSETBYTES(disp, REG_SP, iptr->dst->regoff * 4);
 
-                               i386_jcc(I386_CC_NE, a);
+                               i386_jcc(cd, I386_CC_NE, disp);
 
                                /* XXX: change this when we use registers */
-                               i386_fldl_membase(REG_SP, src->regoff * 8);
-                               i386_mov_imm_reg((s4) asm_builtin_d2l, REG_ITMP1);
-                               i386_call_reg(REG_ITMP1);
-                               i386_mov_reg_membase(REG_RESULT, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_reg_membase(REG_RESULT2, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_fldl_membase(cd, REG_SP, src->regoff * 4);
+                               i386_mov_imm_reg(cd, (ptrint) asm_builtin_d2l, REG_ITMP1);
+                               i386_call_reg(cd, REG_ITMP1);
+                               i386_mov_reg_membase(cd, REG_RESULT, REG_SP, iptr->dst->regoff * 4);
+                               i386_mov_reg_membase(cd, REG_RESULT2, REG_SP, iptr->dst->regoff * 4 + 4);
 
                        } else {
-                               panic("D2L: longs have to be in memory");
+                               log_text("D2L: longs have to be in memory");
+                               assert(0);
                        }
                        break;
 
                case ICMD_F2D:       /* ..., value  ==> ..., (double) value           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        /* nothing to do */
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_D2F:       /* ..., value  ==> ..., (float) value            */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: NO ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(iptr->dst, REG_FTMP3);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
                        /* nothing to do */
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_FCMPL:      /* ..., val1, val2  ==> ..., val1 fcmpl val2    */
                case ICMD_DCMPL:
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        /* exchanged to skip fxch */
                        var_to_reg_flt(s2, src->prev, REG_FTMP1);
                        var_to_reg_flt(s1, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
-/*                     i386_fxch(); */
-                       i386_fucompp();
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+/*                     i386_fxch(cd); */
+                       i386_fucompp(cd);
                        fpu_st_offset -= 2;
-                       i386_fnstsw();
-                       i386_test_imm_reg(0x400, EAX);    /* unordered treat as GT */
-                       i386_jcc(I386_CC_E, 6);
-                       i386_alu_imm_reg(I386_AND, 0x000000ff, EAX);
-                       i386_sahf();
-                       i386_mov_imm_reg(0, d);    /* does not affect flags */
-                       i386_jcc(I386_CC_E, 6 + 1 + 5 + 1);
-                       i386_jcc(I386_CC_B, 1 + 5);
-                       i386_dec_reg(d);
-                       i386_jmp_imm(1);
-                       i386_inc_reg(d);
+                       i386_fnstsw(cd);
+                       i386_test_imm_reg(cd, 0x400, EAX);    /* unordered treat as GT */
+                       i386_jcc(cd, I386_CC_E, 6);
+                       i386_alu_imm_reg(cd, ALU_AND, 0x000000ff, EAX);
+                       i386_sahf(cd);
+                       i386_mov_imm_reg(cd, 0, d);    /* does not affect flags */
+                       i386_jcc(cd, I386_CC_E, 6 + 3 + 5 + 3);
+                       i386_jcc(cd, I386_CC_B, 3 + 5);
+                       i386_alu_imm_reg(cd, ALU_SUB, 1, d);
+                       i386_jmp_imm(cd, 3);
+                       i386_alu_imm_reg(cd, ALU_ADD, 1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
                case ICMD_FCMPG:      /* ..., val1, val2  ==> ..., val1 fcmpg val2    */
                case ICMD_DCMPG:
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        /* exchanged to skip fxch */
                        var_to_reg_flt(s2, src->prev, REG_FTMP1);
                        var_to_reg_flt(s1, src, REG_FTMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
-/*                     i386_fxch(); */
-                       i386_fucompp();
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+/*                     i386_fxch(cd); */
+                       i386_fucompp(cd);
                        fpu_st_offset -= 2;
-                       i386_fnstsw();
-                       i386_test_imm_reg(0x400, EAX);    /* unordered treat as LT */
-                       i386_jcc(I386_CC_E, 3);
-                       i386_movb_imm_reg(1, I386_AH);
-                       i386_sahf();
-                       i386_mov_imm_reg(0, d);    /* does not affect flags */
-                       i386_jcc(I386_CC_E, 6 + 1 + 5 + 1);
-                       i386_jcc(I386_CC_B, 1 + 5);
-                       i386_dec_reg(d);
-                       i386_jmp_imm(1);
-                       i386_inc_reg(d);
+                       i386_fnstsw(cd);
+                       i386_test_imm_reg(cd, 0x400, EAX);    /* unordered treat as LT */
+                       i386_jcc(cd, I386_CC_E, 3);
+                       i386_movb_imm_reg(cd, 1, REG_AH);
+                       i386_sahf(cd);
+                       i386_mov_imm_reg(cd, 0, d);    /* does not affect flags */
+                       i386_jcc(cd, I386_CC_E, 6 + 3 + 5 + 3);
+                       i386_jcc(cd, I386_CC_B, 3 + 5);
+                       i386_alu_imm_reg(cd, ALU_SUB, 1, d);
+                       i386_jmp_imm(cd, 3);
+                       i386_alu_imm_reg(cd, ALU_ADD, 1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
 
                /* memory operations **************************************************/
 
-#define gen_bound_check \
-    if (checkbounds) { \
-        i386_alu_membase_reg(I386_CMP, s1, OFFSET(java_arrayheader, size), s2); \
-        i386_jcc(I386_CC_AE, 0); \
-        codegen_addxboundrefs(mcodeptr); \
-    }
-
                case ICMD_ARRAYLENGTH: /* ..., arrayref  ==> ..., length              */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: NO EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        gen_nullptr_check(s1);
-                       i386_mov_membase_reg(s1, OFFSET(java_arrayheader, size), d);
+                       i386_mov_membase_reg(cd, s1, OFFSET(java_arrayheader, size), d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
                case ICMD_AALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
-                       i386_mov_memindex_reg(OFFSET(java_objectarray, data[0]), s1, s2, 2, d);
+                       i386_mov_memindex_reg(cd, OFFSET(java_objectarray, data[0]), s1, s2, 2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
                case ICMD_LALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
                        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_ITMP3);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
                        
                        if (iptr->dst->flags & INMEMORY) {
-                               i386_mov_memindex_reg(OFFSET(java_longarray, data[0]), s1, s2, 3, REG_ITMP3);
-                               i386_mov_reg_membase(REG_ITMP3, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_memindex_reg(OFFSET(java_longarray, data[0]) + 4, s1, s2, 3, REG_ITMP3);
-                               i386_mov_reg_membase(REG_ITMP3, REG_SP, iptr->dst->regoff * 8 + 4);
+                               i386_mov_memindex_reg(cd, OFFSET(java_longarray, data[0]), s1, s2, 3, REG_ITMP3);
+                               i386_mov_reg_membase(cd, REG_ITMP3, REG_SP, iptr->dst->regoff * 4);
+                               i386_mov_memindex_reg(cd, OFFSET(java_longarray, data[0]) + 4, s1, s2, 3, REG_ITMP3);
+                               i386_mov_reg_membase(cd, REG_ITMP3, REG_SP, iptr->dst->regoff * 4 + 4);
                        }
                        break;
 
                case ICMD_IALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
-                       i386_mov_memindex_reg(OFFSET(java_intarray, data[0]), s1, s2, 2, d);
+                       i386_mov_memindex_reg(cd, OFFSET(java_intarray, data[0]), s1, s2, 2, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
                case ICMD_FALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_FTMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
-                       i386_flds_memindex(OFFSET(java_floatarray, data[0]), s1, s2, 2);
+                       i386_flds_memindex(cd, OFFSET(java_floatarray, data[0]), s1, s2, 2);
                        fpu_st_offset++;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_DALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        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_FTMP3);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
-                       i386_fldl_memindex(OFFSET(java_doublearray, data[0]), s1, s2, 3);
+                       i386_fldl_memindex(cd, OFFSET(java_doublearray, data[0]), s1, s2, 3);
                        fpu_st_offset++;
                        store_reg_to_var_flt(iptr->dst, d);
                        break;
 
                case ICMD_CALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
-                       i386_movzwl_memindex_reg(OFFSET(java_chararray, data[0]), s1, s2, 1, d);
+                       i386_movzwl_memindex_reg(cd, OFFSET(java_chararray, data[0]), s1, s2, 1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;                  
 
                case ICMD_SALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
-                       i386_movswl_memindex_reg(OFFSET(java_shortarray, data[0]), s1, s2, 1, d);
+                       i386_movswl_memindex_reg(cd, OFFSET(java_shortarray, data[0]), s1, s2, 1, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
                case ICMD_BALOAD:     /* ..., arrayref, index  ==> ..., value         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev, REG_ITMP1);
                        var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(iptr->dst, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
                        }
-                       i386_movsbl_memindex_reg(OFFSET(java_bytearray, data[0]), s1, s2, 0, d);
+                       i386_movsbl_memindex_reg(cd, OFFSET(java_bytearray, data[0]), s1, s2, 0, d);
                        store_reg_to_var_int(iptr->dst, d);
                        break;
 
 
-               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);
-                       i386_mov_reg_memindex(s3, OFFSET(java_objectarray, data[0]), s1, s2, 2);
-                       break;
-
                case ICMD_LASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL */
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
@@ -2929,14 +2906,16 @@ void codegen()
                        }
 
                        if (src->flags & INMEMORY) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP3);
-                               i386_mov_reg_memindex(REG_ITMP3, OFFSET(java_longarray, data[0]), s1, s2, 3);
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP3);
-                               i386_mov_reg_memindex(REG_ITMP3, OFFSET(java_longarray, data[0]) + 4, s1, s2, 3);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP3);
+                               i386_mov_reg_memindex(cd, REG_ITMP3, OFFSET(java_longarray, data[0]), s1, s2, 3);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP3);
+                               i386_mov_reg_memindex(cd, REG_ITMP3, OFFSET(java_longarray, data[0]) + 4, s1, s2, 3);
                        }
                        break;
 
                case ICMD_IASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
@@ -2945,10 +2924,12 @@ void codegen()
                                gen_bound_check;
                        }
                        var_to_reg_int(s3, src, REG_ITMP3);
-                       i386_mov_reg_memindex(s3, OFFSET(java_intarray, data[0]), s1, s2, 2);
+                       i386_mov_reg_memindex(cd, s3, OFFSET(java_intarray, data[0]), s1, s2, 2);
                        break;
 
                case ICMD_FASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
@@ -2957,11 +2938,13 @@ void codegen()
                                gen_bound_check;
                        }
                        var_to_reg_flt(s3, src, REG_FTMP1);
-                       i386_fstps_memindex(OFFSET(java_floatarray, data[0]), s1, s2, 2);
+                       i386_fstps_memindex(cd, OFFSET(java_floatarray, data[0]), s1, s2, 2);
                        fpu_st_offset--;
                        break;
 
                case ICMD_DASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
@@ -2970,11 +2953,13 @@ void codegen()
                                gen_bound_check;
                        }
                        var_to_reg_flt(s3, src, REG_FTMP1);
-                       i386_fstpl_memindex(OFFSET(java_doublearray, data[0]), s1, s2, 3);
+                       i386_fstpl_memindex(cd, OFFSET(java_doublearray, data[0]), s1, s2, 3);
                        fpu_st_offset--;
                        break;
 
                case ICMD_CASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
@@ -2983,10 +2968,12 @@ void codegen()
                                gen_bound_check;
                        }
                        var_to_reg_int(s3, src, REG_ITMP3);
-                       i386_movw_reg_memindex(s3, OFFSET(java_chararray, data[0]), s1, s2, 1);
+                       i386_movw_reg_memindex(cd, s3, OFFSET(java_chararray, data[0]), s1, s2, 1);
                        break;
 
                case ICMD_SASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
@@ -2995,10 +2982,12 @@ void codegen()
                                gen_bound_check;
                        }
                        var_to_reg_int(s3, src, REG_ITMP3);
-                       i386_movw_reg_memindex(s3, OFFSET(java_shortarray, data[0]), s1, s2, 1);
+                       i386_movw_reg_memindex(cd, s3, OFFSET(java_shortarray, data[0]), s1, s2, 1);
                        break;
 
                case ICMD_BASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
                        var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
                        var_to_reg_int(s2, src->prev, REG_ITMP2);
@@ -3007,887 +2996,1252 @@ void codegen()
                                gen_bound_check;
                        }
                        var_to_reg_int(s3, src, REG_ITMP3);
-                       M_INTMOVE(s3, REG_ITMP3);    /* because EBP, ESI, EDI have no xH and xL bytes */
-                       i386_movb_reg_memindex(REG_ITMP3, OFFSET(java_bytearray, data[0]), s1, s2, 0);
+                       if (s3 >= EBP) {    /* because EBP, ESI, EDI have no xH and xL nibbles */
+                               M_INTMOVE(s3, REG_ITMP3);
+                               s3 = REG_ITMP3;
+                       }
+                       i386_movb_reg_memindex(cd, s3, OFFSET(java_bytearray, data[0]), s1, s2, 0);
                        break;
 
+               case ICMD_AASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
-               case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
-                                     /* op1 = type, val.a = field address            */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL */
 
-                       /* if class isn't yet initialized, do it */
-                       if (!((fieldinfo *) iptr->val.a)->class->initialized) {
-                               /* call helper function which patches this code */
-                               i386_mov_imm_reg((s4) ((fieldinfo *) iptr->val.a)->class, REG_ITMP1);
-                               i386_mov_imm_reg((s4) asm_check_clinit, REG_ITMP2);
-                               i386_call_reg(REG_ITMP2);
-                       }
+                       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);
 
-                       a = dseg_addaddress(&(((fieldinfo *) iptr->val.a)->value));
-                       /* here it's slightly slower */
-                       i386_mov_imm_reg(0, REG_ITMP2);
-                       dseg_adddata(mcodeptr);
-                       i386_mov_membase_reg(REG_ITMP2, a, REG_ITMP2);
-                       switch (iptr->op1) {
-                       case TYPE_INT:
-                       case TYPE_ADR:
-                               var_to_reg_int(s2, src, REG_ITMP1);
-                               i386_mov_reg_membase(s2, REG_ITMP2, 0);
-                               break;
-                       case TYPE_LNG:
-                               if (src->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_ITMP2, 0);
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_ITMP2, 0 + 4);
-                               } else {
-                                       panic("PUTSTATIC: longs have to be in memory");
-                               }
-                               break;
-                       case TYPE_FLT:
-                               var_to_reg_flt(s2, src, REG_FTMP1);
-                               i386_fstps_membase(REG_ITMP2, 0);
-                               fpu_st_offset--;
-                               break;
-                       case TYPE_DBL:
-                               var_to_reg_flt(s2, src, REG_FTMP1);
-                               i386_fstpl_membase(REG_ITMP2, 0);
-                               fpu_st_offset--;
-                               break;
-                       default: panic ("internal error");
+                       M_AST(s1, REG_SP, 0 * 4);
+                       M_AST(s3, REG_SP, 1 * 4);
+                       M_MOV_IMM((ptrint) BUILTIN_canstore, REG_ITMP1);
+                       M_CALL(REG_ITMP1);
+                       M_TEST(REG_RESULT);
+                       M_BEQ(0);
+                       codegen_addxstorerefs(cd, cd->mcodeptr);
+
+                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
+                       var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       var_to_reg_int(s3, src, REG_ITMP3);
+                       i386_mov_reg_memindex(cd, s3, OFFSET(java_objectarray, data[0]), s1, s2, 2);
+                       break;
+
+               case ICMD_IASTORECONST: /* ..., arrayref, index  ==> ...              */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
+
+                       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;
+                       }
+                       i386_mov_imm_memindex(cd, iptr->val.i, OFFSET(java_intarray, data[0]), s1, s2, 2);
+                       break;
+
+               case ICMD_LASTORECONST: /* ..., arrayref, index  ==> ...              */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
+
+                       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;
+                       }
+
+                       i386_mov_imm_memindex(cd, (u4) (iptr->val.l & 0x00000000ffffffff), OFFSET(java_longarray, data[0]), s1, s2, 3);
+                       i386_mov_imm_memindex(cd, (u4) (iptr->val.l >> 32), OFFSET(java_longarray, data[0]) + 4, s1, s2, 3);
+                       break;
+
+               case ICMD_AASTORECONST: /* ..., arrayref, index  ==> ...              */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
+
+                       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;
+                       }
+                       i386_mov_imm_memindex(cd, 0, OFFSET(java_objectarray, data[0]), s1, s2, 2);
+                       break;
+
+               case ICMD_BASTORECONST: /* ..., arrayref, index  ==> ...              */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
+
+                       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;
+                       }
+                       i386_movb_imm_memindex(cd, iptr->val.i, OFFSET(java_bytearray, data[0]), s1, s2, 0);
+                       break;
+
+               case ICMD_CASTORECONST:   /* ..., arrayref, index  ==> ...            */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
+
+                       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;
+                       }
+                       i386_movw_imm_memindex(cd, iptr->val.i, OFFSET(java_chararray, data[0]), s1, s2, 1);
+                       break;
+
+               case ICMD_SASTORECONST:   /* ..., arrayref, index  ==> ...            */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: NO OUTPUT: REG_NULL*/ 
+
+                       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;
                        }
+                       i386_movw_imm_memindex(cd, iptr->val.i, OFFSET(java_shortarray, data[0]), s1, s2, 1);
                        break;
 
+
                case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
                                      /* op1 = type, val.a = field address            */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: EAX*/ 
 
-                       /* if class isn't yet initialized, do it */
-                       if (!((fieldinfo *) iptr->val.a)->class->initialized) {
-                               /* call helper function which patches this code */
-                               i386_mov_imm_reg((s4) ((fieldinfo *) iptr->val.a)->class, REG_ITMP1);
-                               i386_mov_imm_reg((s4) asm_check_clinit, REG_ITMP2);
-                               i386_call_reg(REG_ITMP2);
-                       }
+                       if (iptr->val.a == NULL) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_get_putstatic,
+                                                                       (unresolved_field *) iptr->target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
+
+                               disp = 0;
+
+                       } else {
+                               fieldinfo *fi = iptr->val.a;
 
-                       a = dseg_addaddress(&(((fieldinfo *) iptr->val.a)->value));
-                       i386_mov_imm_reg(0, REG_ITMP2);
-                       dseg_adddata(mcodeptr);
-                       i386_mov_membase_reg(REG_ITMP2, a, REG_ITMP2);
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_clinit, fi->class, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                       }
+                               }
+
+                               disp = (ptrint) &(fi->value);
+                       }
+
+                       M_MOV_IMM(disp, REG_ITMP1);
                        switch (iptr->op1) {
                        case TYPE_INT:
                        case TYPE_ADR:
-                               d = reg_of_var(iptr->dst, REG_ITMP1);
-                               i386_mov_membase_reg(REG_ITMP2, 0, d);
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               M_ILD(d, REG_ITMP1, 0);
                                store_reg_to_var_int(iptr->dst, d);
                                break;
                        case TYPE_LNG:
-                               d = reg_of_var(iptr->dst, REG_NULL);
+                               d = reg_of_var(rd, iptr->dst, REG_NULL);
                                if (iptr->dst->flags & INMEMORY) {
-                                       i386_mov_membase_reg(REG_ITMP2, 0, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_membase_reg(REG_ITMP2, 0 + 4, REG_ITMP1);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
+                                       /* Using both REG_ITMP2 and REG_ITMP3 is faster
+                                          than only using REG_ITMP2 alternating. */
+                                       i386_mov_membase_reg(cd, REG_ITMP1, 0, REG_ITMP2);
+                                       i386_mov_membase_reg(cd, REG_ITMP1, 4, REG_ITMP3);
+                                       i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4);
+                                       i386_mov_reg_membase(cd, REG_ITMP3, REG_SP, iptr->dst->regoff * 4 + 4);
                                } else {
-                                       panic("GETSTATIC: longs have to be in memory");
+                                       log_text("GETSTATIC: longs have to be in memory");
+                                       assert(0);
                                }
                                break;
                        case TYPE_FLT:
-                               d = reg_of_var(iptr->dst, REG_FTMP1);
-                               i386_flds_membase(REG_ITMP2, 0);
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               i386_flds_membase(cd, REG_ITMP1, 0);
                                fpu_st_offset++;
                                store_reg_to_var_flt(iptr->dst, d);
                                break;
                        case TYPE_DBL:                          
-                               d = reg_of_var(iptr->dst, REG_FTMP1);
-                               i386_fldl_membase(REG_ITMP2, 0);
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               i386_fldl_membase(cd, REG_ITMP1, 0);
                                fpu_st_offset++;
                                store_reg_to_var_flt(iptr->dst, d);
                                break;
-                       default: panic ("internal error");
                        }
                        break;
 
-               case ICMD_PUTFIELD:   /* ..., value  ==> ...                          */
-                                     /* op1 = type, val.i = field offset             */
+               case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
+                                     /* op1 = type, val.a = field address            */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
-                       a = ((fieldinfo *)(iptr->val.a))->offset;
-                       switch (iptr->op1) {
-                               case TYPE_INT:
-                               case TYPE_ADR:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       gen_nullptr_check(s1);
-                                       i386_mov_reg_membase(s2, s1, a);
-                                       break;
-                               case TYPE_LNG:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       gen_nullptr_check(s1);
-                                       if (src->flags & INMEMORY) {
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP2);
-                                               i386_mov_reg_membase(REG_ITMP2, s1, a);
-                                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
-                                               i386_mov_reg_membase(REG_ITMP2, s1, a + 4);
-                                       } else {
-                                               panic("PUTFIELD: longs have to be in memory");
+                       if (iptr->val.a == NULL) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_get_putstatic,
+                                                                       (unresolved_field *) iptr->target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
+
+                               disp = 0;
+
+                       } else {
+                               fieldinfo *fi = iptr->val.a;
+
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_clinit, fi->class, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
                                        }
-                                       break;
-                               case TYPE_FLT:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_flt(s2, src, REG_FTMP1);
-                                       gen_nullptr_check(s1);
-                                       i386_fstps_membase(s1, a);
-                                       fpu_st_offset--;
-                                       break;
-                               case TYPE_DBL:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_flt(s2, src, REG_FTMP1);
-                                       gen_nullptr_check(s1);
-                                       i386_fstpl_membase(s1, a);
-                                       fpu_st_offset--;
-                                       break;
-                               default: panic ("internal error");
                                }
-                       break;
 
-               case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
-                                     /* op1 = type, val.i = field offset             */
+                               disp = (ptrint) &(fi->value);
+                       }
 
-                       a = ((fieldinfo *)(iptr->val.a))->offset;
+                       M_MOV_IMM(disp, REG_ITMP1);
                        switch (iptr->op1) {
-                               case TYPE_INT:
-                               case TYPE_ADR:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(iptr->dst, REG_ITMP2);
-                                       gen_nullptr_check(s1);
-                                       i386_mov_membase_reg(s1, a, d);
-                                       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_NULL);
-                                       gen_nullptr_check(s1);
-                                       i386_mov_membase_reg(s1, a, REG_ITMP2);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8);
-                                       i386_mov_membase_reg(s1, a + 4, REG_ITMP2);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, iptr->dst->regoff * 8 + 4);
-                                       break;
-                               case TYPE_FLT:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(iptr->dst, REG_FTMP1);
-                                       gen_nullptr_check(s1);
-                                       i386_flds_membase(s1, a);
-                                       fpu_st_offset++;
-                                       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);
-                                       i386_fldl_membase(s1, a);
-                                       fpu_st_offset++;
-                                       store_reg_to_var_flt(iptr->dst, d);
-                                       break;
-                               default: panic ("internal error");
+                       case TYPE_INT:
+                       case TYPE_ADR:
+                               var_to_reg_int(s2, src, REG_ITMP2);
+                               M_IST(s2, REG_ITMP1, 0);
+                               break;
+                       case TYPE_LNG:
+                               if (src->flags & INMEMORY) {
+                                       /* Using both REG_ITMP2 and REG_ITMP3 is faster
+                                          than only using REG_ITMP2 alternating. */
+                                       s2 = src->regoff;
+
+                                       i386_mov_membase_reg(cd, REG_SP, s2 * 4, REG_ITMP2);
+                                       i386_mov_membase_reg(cd, REG_SP, s2 * 4 + 4, REG_ITMP3);
+                                       i386_mov_reg_membase(cd, REG_ITMP2, REG_ITMP1, 0);
+                                       i386_mov_reg_membase(cd, REG_ITMP3, REG_ITMP1, 4);
+                               } else {
+                                       log_text("PUTSTATIC: longs have to be in memory");
+                                       assert(0);
                                }
+                               break;
+                       case TYPE_FLT:
+                               var_to_reg_flt(s2, src, REG_FTMP1);
+                               i386_fstps_membase(cd, REG_ITMP1, 0);
+                               fpu_st_offset--;
+                               break;
+                       case TYPE_DBL:
+                               var_to_reg_flt(s2, src, REG_FTMP1);
+                               i386_fstpl_membase(cd, REG_ITMP1, 0);
+                               fpu_st_offset--;
+                               break;
+                       }
                        break;
 
+               case ICMD_PUTSTATICCONST: /* ...  ==> ...                             */
+                                         /* val = value (in current instruction)     */
+                                         /* op1 = type, val.a = field address (in    */
+                                         /* following NOP)                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
 
-               /* branch operations **************************************************/
+                       if (iptr[1].val.a == NULL) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_get_putstatic,
+                                                                       (unresolved_field *) iptr[1].target, 0);
 
-                       /* TWISTI */
-/*  #define ALIGNCODENOP {if((int)((long)mcodeptr&7)){M_NOP;}} */
-#define ALIGNCODENOP do {} while (0)
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
 
-               case ICMD_ATHROW:       /* ..., objectref ==> ... (, objectref)       */
+                               disp = 0;
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       M_INTMOVE(s1, REG_ITMP1_XPTR);
+                       } else {
+                               fieldinfo *fi = iptr[1].val.a;
 
-                       i386_call_imm(0);                    /* passing exception pointer */
-                       i386_pop_reg(REG_ITMP2_XPC);
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_clinit, fi->class, 0);
 
-                       i386_mov_imm_reg((s4) asm_handle_exception, REG_ITMP3);
-                       i386_jmp_reg(REG_ITMP3);
-                       ALIGNCODENOP;
-                       break;
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                       }
+                               }
 
-               case ICMD_GOTO:         /* ... ==> ...                                */
-                                       /* op1 = target JavaVM pc                     */
+                               disp = (ptrint) &(fi->value);
+                       }
 
-                       i386_jmp_imm(0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
-                       ALIGNCODENOP;
+                       M_MOV_IMM(disp, REG_ITMP1);
+                       switch (iptr[1].op1) {
+                       case TYPE_INT:
+                       case TYPE_FLT:
+                       case TYPE_ADR:
+                               i386_mov_imm_membase(cd, iptr->val.i, REG_ITMP1, 0);
+                               break;
+                       case TYPE_LNG:
+                       case TYPE_DBL:
+                               i386_mov_imm_membase(cd, iptr->val.l, REG_ITMP1, 0);
+                               i386_mov_imm_membase(cd, iptr->val.l >> 32, REG_ITMP1, 4);
+                               break;
+                       }
                        break;
 
-               case ICMD_JSR:          /* ... ==> ...                                */
-                                       /* op1 = target JavaVM pc                     */
+               case ICMD_GETFIELD:   /* .., objectref.  ==> ..., value               */
+                                     /* op1 = type, val.i = field offset             */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL */ 
 
-                       i386_call_imm(0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
-                       break;
-                       
-               case ICMD_RET:          /* ... ==> ...                                */
-                                       /* op1 = local variable                       */
+                       var_to_reg_int(s1, src, REG_ITMP1);
+                       gen_nullptr_check(s1);
 
-                       var = &(locals[iptr->op1][TYPE_ADR]);
-                       var_to_reg_int(s1, var, REG_ITMP1);
-                       i386_jmp_reg(s1);
-                       break;
+                       if (iptr->val.a == NULL) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_getfield,
+                                                                       (unresolved_field *) iptr->target, 0);
 
-               case ICMD_IFNULL:       /* ..., value ==> ...                         */
-                                       /* op1 = target JavaVM pc                     */
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
 
-                       if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8);
+                               disp = 0;
 
                        } else {
-                               i386_test_reg_reg(src->regoff, src->regoff);
+                               disp = ((fieldinfo *) (iptr->val.a))->offset;
                        }
-                       i386_jcc(I386_CC_E, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
-                       break;
 
-               case ICMD_IFNONNULL:    /* ..., value ==> ...                         */
-                                       /* op1 = target JavaVM pc                     */
-
-                       if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8);
+                       switch (iptr->op1) {
+                       case TYPE_INT:
+                       case TYPE_ADR:
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                               i386_mov_membase32_reg(cd, s1, disp, d);
+                               store_reg_to_var_int(iptr->dst, d);
+                               break;
+                       case TYPE_LNG:
+                               d = reg_of_var(rd, iptr->dst, REG_NULL);
+                               i386_mov_membase32_reg(cd, s1, disp, REG_ITMP2);
+                               i386_mov_membase32_reg(cd, s1, disp + 4, REG_ITMP3);
+                               i386_mov_reg_membase(cd, REG_ITMP2, REG_SP, iptr->dst->regoff * 4);
+                               i386_mov_reg_membase(cd, REG_ITMP3, REG_SP, iptr->dst->regoff * 4 + 4);
+                               break;
+                       case TYPE_FLT:
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               i386_flds_membase32(cd, s1, disp);
+                               fpu_st_offset++;
+                               store_reg_to_var_flt(iptr->dst, d);
+                               break;
+                       case TYPE_DBL:                          
+                               d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                               i386_fldl_membase32(cd, s1, disp);
+                               fpu_st_offset++;
+                               store_reg_to_var_flt(iptr->dst, d);
+                               break;
+                       }
+                       break;
+
+               case ICMD_PUTFIELD:   /* ..., objectref, value  ==> ...               */
+                                     /* op1 = type, val.a = field address            */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
+
+                       var_to_reg_int(s1, src->prev, REG_ITMP1);
+                       gen_nullptr_check(s1);
+
+                       if ((iptr->op1 == TYPE_INT) || IS_ADR_TYPE(iptr->op1)) {
+                               var_to_reg_int(s2, src, REG_ITMP2);
+                       } else if (IS_FLT_DBL_TYPE(iptr->op1)) {
+                               var_to_reg_flt(s2, src, REG_FTMP2);
+                       }
+
+                       if (iptr->val.a == NULL) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_putfield,
+                                                                       (unresolved_field *) iptr->target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
+
+                               disp = 0;
+
+                       } else {
+                               disp = ((fieldinfo *) (iptr->val.a))->offset;
+                       }
+
+                       switch (iptr->op1) {
+                       case TYPE_INT:
+                       case TYPE_ADR:
+                               i386_mov_reg_membase32(cd, s2, s1, disp);
+                               break;
+                       case TYPE_LNG:
+                               if (src->flags & INMEMORY) {
+                                       i386_mov_membase32_reg(cd, REG_SP, src->regoff * 4, REG_ITMP2);
+                                       i386_mov_membase32_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP3);
+                                       i386_mov_reg_membase32(cd, REG_ITMP2, s1, disp);
+                                       i386_mov_reg_membase32(cd, REG_ITMP3, s1, disp + 4);
+                               } else {
+                                       log_text("PUTFIELD: longs have to be in memory");
+                                       assert(0);
+                               }
+                               break;
+                       case TYPE_FLT:
+                               i386_fstps_membase32(cd, s1, disp);
+                               fpu_st_offset--;
+                               break;
+                       case TYPE_DBL:
+                               i386_fstpl_membase32(cd, s1, disp);
+                               fpu_st_offset--;
+                               break;
+                       }
+                       break;
+
+               case ICMD_PUTFIELDCONST:  /* ..., objectref  ==> ...                  */
+                                         /* val = value (in current instruction)     */
+                                         /* op1 = type, val.a = field address (in    */
+                                         /* following NOP)                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: S|YES EDX: S|YES OUTPUT: REG_NULL*/ 
+
+                       var_to_reg_int(s1, src, REG_ITMP1);
+                       gen_nullptr_check(s1);
+
+                       if (iptr[1].val.a == NULL) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_putfieldconst,
+                                                                       (unresolved_field *) iptr[1].target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
+
+                               disp = 0;
+
+                       } else {
+                               disp = ((fieldinfo *) (iptr[1].val.a))->offset;
+                       }
+
+                       switch (iptr[1].op1) {
+                       case TYPE_INT:
+                       case TYPE_FLT:
+                       case TYPE_ADR:
+                               i386_mov_imm_membase32(cd, iptr->val.i, s1, disp);
+                               break;
+                       case TYPE_LNG:
+                       case TYPE_DBL:
+                               i386_mov_imm_membase32(cd, iptr->val.l, s1, disp);
+                               i386_mov_imm_membase32(cd, iptr->val.l >> 32, s1, disp + 4);
+                               break;
+                       }
+                       break;
+
+
+               /* branch operations **************************************************/
+
+               case ICMD_ATHROW:       /* ..., objectref ==> ... (, objectref)       */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL */
+
+                       var_to_reg_int(s1, src, REG_ITMP1);
+                       M_INTMOVE(s1, REG_ITMP1_XPTR);
+
+#ifdef ENABLE_VERIFIER
+                       if (iptr->val.a) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_athrow_areturn,
+                                                                       (unresolved_class *) iptr->val.a, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
+                       }
+#endif /* ENABLE_VERIFIER */
+
+                       M_CALL_IMM(0);                            /* passing exception pc */
+                       M_POP(REG_ITMP2_XPC);
+
+                       M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
+                       break;
+
+               case ICMD_GOTO:         /* ... ==> ...                                */
+                                       /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
+
+                       i386_jmp_imm(cd, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
+                       break;
+
+               case ICMD_JSR:          /* ... ==> ...                                */
+                                       /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
+
+                       i386_call_imm(cd, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
+                       break;
+                       
+               case ICMD_RET:          /* ... ==> ...                                */
+                                       /* op1 = local variable                       */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
+
+                       var = &(rd->locals[iptr->op1][TYPE_ADR]);
+                       var_to_reg_int(s1, var, REG_ITMP1);
+                       i386_jmp_reg(cd, s1);
+                       break;
+
+               case ICMD_IFNULL:       /* ..., value ==> ...                         */
+                                       /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
+
+                       if (src->flags & INMEMORY) {
+                               i386_alu_imm_membase(cd, ALU_CMP, 0, REG_SP, src->regoff * 4);
+
+                       } else {
+                               i386_test_reg_reg(cd, src->regoff, src->regoff);
+                       }
+                       i386_jcc(cd, I386_CC_E, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
+                       break;
+
+               case ICMD_IFNONNULL:    /* ..., value ==> ...                         */
+                                       /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
+
+                       if (src->flags & INMEMORY) {
+                               i386_alu_imm_membase(cd, ALU_CMP, 0, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_test_reg_reg(src->regoff, src->regoff);
+                               i386_test_reg_reg(cd, src->regoff, src->regoff);
                        }
-                       i386_jcc(I386_CC_NE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_NE, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IFEQ:         /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.i = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.i, REG_SP, src->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.i, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_alu_imm_reg(I386_CMP, iptr->val.i, src->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, iptr->val.i, src->regoff);
                        }
-                       i386_jcc(I386_CC_E, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_E, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IFLT:         /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.i = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.i, REG_SP, src->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.i, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_alu_imm_reg(I386_CMP, iptr->val.i, src->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, iptr->val.i, src->regoff);
                        }
-                       i386_jcc(I386_CC_L, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_L, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IFLE:         /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.i = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.i, REG_SP, src->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.i, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_alu_imm_reg(I386_CMP, iptr->val.i, src->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, iptr->val.i, src->regoff);
                        }
-                       i386_jcc(I386_CC_LE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_LE, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IFNE:         /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.i = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.i, REG_SP, src->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.i, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_alu_imm_reg(I386_CMP, iptr->val.i, src->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, iptr->val.i, src->regoff);
                        }
-                       i386_jcc(I386_CC_NE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_NE, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IFGT:         /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.i = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.i, REG_SP, src->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.i, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_alu_imm_reg(I386_CMP, iptr->val.i, src->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, iptr->val.i, src->regoff);
                        }
-                       i386_jcc(I386_CC_G, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_G, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IFGE:         /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.i = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.i, REG_SP, src->regoff * 8);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.i, REG_SP, src->regoff * 4);
 
                        } else {
-                               i386_alu_imm_reg(I386_CMP, iptr->val.i, src->regoff);
+                               i386_alu_imm_reg(cd, ALU_CMP, iptr->val.i, src->regoff);
                        }
-                       i386_jcc(I386_CC_GE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_GE, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LEQ:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
                                if (iptr->val.l == 0) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_alu_membase_reg(I386_OR, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_alu_membase_reg(cd, ALU_OR, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
 
                                } else {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP2);
-                                       i386_alu_imm_reg(I386_XOR, iptr->val.l >> 32, REG_ITMP2);
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_alu_imm_reg(I386_XOR, iptr->val.l, REG_ITMP1);
-                                       i386_alu_reg_reg(I386_OR, REG_ITMP2, REG_ITMP1);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
+                                       i386_alu_imm_reg(cd, ALU_XOR, iptr->val.l >> 32, REG_ITMP2);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_alu_imm_reg(cd, ALU_XOR, iptr->val.l, REG_ITMP1);
+                                       i386_alu_reg_reg(cd, ALU_OR, REG_ITMP2, REG_ITMP1);
                                }
                        }
-                       i386_test_reg_reg(REG_ITMP1, REG_ITMP1);
-                       i386_jcc(I386_CC_E, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_test_reg_reg(cd, REG_ITMP1, REG_ITMP1);
+                       i386_jcc(cd, I386_CC_E, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LLT:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 8 + 4);
-                               i386_jcc(I386_CC_L, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 4 + 4);
+                               i386_jcc(cd, I386_CC_L, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               CALCIMMEDIATEBYTES(a, iptr->val.l);
+                               disp = 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               CALCIMMEDIATEBYTES(disp, iptr->val.l);
 
-                               i386_jcc(I386_CC_G, a);
+                               i386_jcc(cd, I386_CC_G, disp);
 
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l, REG_SP, src->regoff * 8);
-                               i386_jcc(I386_CC_B, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l, REG_SP, src->regoff * 4);
+                               i386_jcc(cd, I386_CC_B, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                case ICMD_IF_LLE:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 8 + 4);
-                               i386_jcc(I386_CC_L, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 4 + 4);
+                               i386_jcc(cd, I386_CC_L, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               CALCIMMEDIATEBYTES(a, iptr->val.l);
+                               disp = 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               CALCIMMEDIATEBYTES(disp, iptr->val.l);
                                
-                               i386_jcc(I386_CC_G, a);
+                               i386_jcc(cd, I386_CC_G, disp);
 
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l, REG_SP, src->regoff * 8);
-                               i386_jcc(I386_CC_BE, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l, REG_SP, src->regoff * 4);
+                               i386_jcc(cd, I386_CC_BE, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                case ICMD_IF_LNE:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
                                if (iptr->val.l == 0) {
-                                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_alu_membase_reg(I386_OR, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
+                                       i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_alu_membase_reg(cd, ALU_OR, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
 
                                } else {
-                                       i386_mov_imm_reg(iptr->val.l, REG_ITMP1);
-                                       i386_alu_membase_reg(I386_XOR, REG_SP, src->regoff * 8, REG_ITMP1);
-                                       i386_mov_imm_reg(iptr->val.l >> 32, REG_ITMP2);
-                                       i386_alu_membase_reg(I386_XOR, REG_SP, src->regoff * 8 + 4, REG_ITMP2);
-                                       i386_alu_reg_reg(I386_OR, REG_ITMP2, REG_ITMP1);
+                                       i386_mov_imm_reg(cd, iptr->val.l, REG_ITMP1);
+                                       i386_alu_membase_reg(cd, ALU_XOR, REG_SP, src->regoff * 4, REG_ITMP1);
+                                       i386_mov_imm_reg(cd, iptr->val.l >> 32, REG_ITMP2);
+                                       i386_alu_membase_reg(cd, ALU_XOR, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
+                                       i386_alu_reg_reg(cd, ALU_OR, REG_ITMP2, REG_ITMP1);
                                }
                        }
-                       i386_test_reg_reg(REG_ITMP1, REG_ITMP1);
-                       i386_jcc(I386_CC_NE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_test_reg_reg(cd, REG_ITMP1, REG_ITMP1);
+                       i386_jcc(cd, I386_CC_NE, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LGT:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 8 + 4);
-                               i386_jcc(I386_CC_G, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 4 + 4);
+                               i386_jcc(cd, I386_CC_G, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               CALCIMMEDIATEBYTES(a, iptr->val.l);
+                               disp = 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               CALCIMMEDIATEBYTES(disp, iptr->val.l);
 
-                               i386_jcc(I386_CC_L, a);
+                               i386_jcc(cd, I386_CC_L, disp);
 
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l, REG_SP, src->regoff * 8);
-                               i386_jcc(I386_CC_A, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l, REG_SP, src->regoff * 4);
+                               i386_jcc(cd, I386_CC_A, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                case ICMD_IF_LGE:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 8 + 4);
-                               i386_jcc(I386_CC_G, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l >> 32, REG_SP, src->regoff * 4 + 4);
+                               i386_jcc(cd, I386_CC_G, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
-                               CALCIMMEDIATEBYTES(a, iptr->val.l);
+                               disp = 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
+                               CALCIMMEDIATEBYTES(disp, iptr->val.l);
 
-                               i386_jcc(I386_CC_L, a);
+                               i386_jcc(cd, I386_CC_L, disp);
 
-                               i386_alu_imm_membase(I386_CMP, iptr->val.l, REG_SP, src->regoff * 8);
-                               i386_jcc(I386_CC_AE, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_alu_imm_membase(cd, ALU_CMP, iptr->val.l, REG_SP, src->regoff * 4);
+                               i386_jcc(cd, I386_CC_AE, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                case ICMD_IF_ICMPEQ:    /* ..., value, value ==> ...                  */
                case ICMD_IF_ACMPEQ:    /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(I386_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 8);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_reg_membase(cd, ALU_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 4);
 
                        } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, src->prev->regoff);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, src->prev->regoff);
 
                        } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_alu_reg_membase(I386_CMP, src->regoff, REG_SP, src->prev->regoff * 8);
+                               i386_alu_reg_membase(cd, ALU_CMP, src->regoff, REG_SP, src->prev->regoff * 4);
 
                        } else {
-                               i386_alu_reg_reg(I386_CMP, src->regoff, src->prev->regoff);
+                               i386_alu_reg_reg(cd, ALU_CMP, src->regoff, src->prev->regoff);
                        }
-                       i386_jcc(I386_CC_E, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_E, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LCMPEQ:    /* ..., value, value ==> ...                  */
                                        /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP2);
-                               i386_alu_membase_reg(I386_XOR, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(I386_XOR, REG_SP, src->regoff * 8 + 4, REG_ITMP2);
-                               i386_alu_reg_reg(I386_OR, REG_ITMP2, REG_ITMP1);
-                               i386_test_reg_reg(REG_ITMP1, REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP2);
+                               i386_alu_membase_reg(cd, ALU_XOR, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_XOR, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
+                               i386_alu_reg_reg(cd, ALU_OR, REG_ITMP2, REG_ITMP1);
+                               i386_test_reg_reg(cd, REG_ITMP1, REG_ITMP1);
                        }                       
-                       i386_jcc(I386_CC_E, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_E, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_ICMPNE:    /* ..., value, value ==> ...                  */
                case ICMD_IF_ACMPNE:    /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(I386_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 8);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_reg_membase(cd, ALU_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 4);
 
                        } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, src->prev->regoff);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, src->prev->regoff);
 
                        } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_alu_reg_membase(I386_CMP, src->regoff, REG_SP, src->prev->regoff * 8);
+                               i386_alu_reg_membase(cd, ALU_CMP, src->regoff, REG_SP, src->prev->regoff * 4);
 
                        } else {
-                               i386_alu_reg_reg(I386_CMP, src->regoff, src->prev->regoff);
+                               i386_alu_reg_reg(cd, ALU_CMP, src->regoff, src->prev->regoff);
                        }
-                       i386_jcc(I386_CC_NE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_NE, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LCMPNE:    /* ..., value, value ==> ...                  */
                                        /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP2);
-                               i386_alu_membase_reg(I386_XOR, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(I386_XOR, REG_SP, src->regoff * 8 + 4, REG_ITMP2);
-                               i386_alu_reg_reg(I386_OR, REG_ITMP2, REG_ITMP1);
-                               i386_test_reg_reg(REG_ITMP1, REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP2);
+                               i386_alu_membase_reg(cd, ALU_XOR, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_XOR, REG_SP, src->regoff * 4 + 4, REG_ITMP2);
+                               i386_alu_reg_reg(cd, ALU_OR, REG_ITMP2, REG_ITMP1);
+                               i386_test_reg_reg(cd, REG_ITMP1, REG_ITMP1);
                        }                       
-                       i386_jcc(I386_CC_NE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_NE, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_ICMPLT:    /* ..., value, value ==> ...                  */
                                        /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(I386_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 8);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_reg_membase(cd, ALU_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 4);
 
                        } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, src->prev->regoff);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, src->prev->regoff);
 
                        } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_alu_reg_membase(I386_CMP, src->regoff, REG_SP, src->prev->regoff * 8);
+                               i386_alu_reg_membase(cd, ALU_CMP, src->regoff, REG_SP, src->prev->regoff * 4);
 
                        } else {
-                               i386_alu_reg_reg(I386_CMP, src->regoff, src->prev->regoff);
+                               i386_alu_reg_reg(cd, ALU_CMP, src->regoff, src->prev->regoff);
                        }
-                       i386_jcc(I386_CC_L, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       i386_jcc(cd, I386_CC_L, 0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LCMPLT:    /* ..., value, value ==> ...                  */
                                    /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                               i386_jcc(I386_CC_L, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                               M_BLT(0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->prev->regoff * 8);
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff);
+                               disp = 3 + 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->prev->regoff * 4);
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
 
-                               i386_jcc(I386_CC_G, a);
+                               M_BGT(disp);
 
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_jcc(I386_CC_B, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_jcc(cd, I386_CC_B, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                case ICMD_IF_ICMPGT:    /* ..., value, value ==> ...                  */
                                        /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(I386_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 8);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_reg_membase(cd, ALU_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 4);
 
                        } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, src->prev->regoff);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, src->prev->regoff);
 
                        } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_alu_reg_membase(I386_CMP, src->regoff, REG_SP, src->prev->regoff * 8);
+                               i386_alu_reg_membase(cd, ALU_CMP, src->regoff, REG_SP, src->prev->regoff * 4);
 
                        } else {
-                               i386_alu_reg_reg(I386_CMP, src->regoff, src->prev->regoff);
+                               i386_alu_reg_reg(cd, ALU_CMP, src->regoff, src->prev->regoff);
                        }
-                       i386_jcc(I386_CC_G, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       M_BGT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LCMPGT:    /* ..., value, value ==> ...                  */
                                 /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                               i386_jcc(I386_CC_G, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                               M_BGT(0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->prev->regoff * 8);
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
+                               disp = 3 + 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->prev->regoff * 4);
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
 
-                               i386_jcc(I386_CC_L, a);
+                               M_BLT(disp);
 
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_jcc(I386_CC_A, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_jcc(cd, I386_CC_A, 0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                case ICMD_IF_ICMPLE:    /* ..., value, value ==> ...                  */
                                        /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(I386_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 8);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_reg_membase(cd, ALU_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 4);
 
                        } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, src->prev->regoff);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, src->prev->regoff);
 
                        } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_alu_reg_membase(I386_CMP, src->regoff, REG_SP, src->prev->regoff * 8);
+                               i386_alu_reg_membase(cd, ALU_CMP, src->regoff, REG_SP, src->prev->regoff * 4);
 
                        } else {
-                               i386_alu_reg_reg(I386_CMP, src->regoff, src->prev->regoff);
+                               i386_alu_reg_reg(cd, ALU_CMP, src->regoff, src->prev->regoff);
                        }
-                       i386_jcc(I386_CC_LE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       M_BLE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LCMPLE:    /* ..., value, value ==> ...                  */
                                        /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                               i386_jcc(I386_CC_L, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                               M_BLT(0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->prev->regoff * 8);
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
+                               disp = 3 + 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->prev->regoff * 4);
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
 
-                               i386_jcc(I386_CC_G, a);
+                               M_BGT(disp);
 
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_jcc(I386_CC_BE, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, REG_ITMP1);
+                               M_BBE(0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                case ICMD_IF_ICMPGE:    /* ..., value, value ==> ...                  */
                                        /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(I386_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 8);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                               i386_alu_reg_membase(cd, ALU_CMP, REG_ITMP1, REG_SP, src->prev->regoff * 4);
 
                        } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, src->prev->regoff);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, src->prev->regoff);
 
                        } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_alu_reg_membase(I386_CMP, src->regoff, REG_SP, src->prev->regoff * 8);
+                               i386_alu_reg_membase(cd, ALU_CMP, src->regoff, REG_SP, src->prev->regoff * 4);
 
                        } else {
-                               i386_alu_reg_reg(I386_CMP, src->regoff, src->prev->regoff);
+                               i386_alu_reg_reg(cd, ALU_CMP, src->regoff, src->prev->regoff);
                        }
-                       i386_jcc(I386_CC_GE, 0);
-                       codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                       M_BGE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        break;
 
                case ICMD_IF_LCMPGE:    /* ..., value, value ==> ...                  */
                                    /* op1 = target JavaVM pc                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
                        if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                               i386_jcc(I386_CC_G, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4 + 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4 + 4, REG_ITMP1);
+                               M_BGT(0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
 
-                               a = 3 + 3 + 6;
-                               CALCOFFSETBYTES(a, REG_SP, src->prev->regoff * 8);
-                               CALCOFFSETBYTES(a, REG_SP, src->regoff * 8);
+                               disp = 3 + 3 + 6;
+                               CALCOFFSETBYTES(disp, REG_SP, src->prev->regoff * 4);
+                               CALCOFFSETBYTES(disp, REG_SP, src->regoff * 4);
 
-                               i386_jcc(I386_CC_L, a);
+                               M_BLT(disp);
 
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(I386_CMP, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_jcc(I386_CC_AE, 0);
-                               codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+                               i386_mov_membase_reg(cd, REG_SP, src->prev->regoff * 4, REG_ITMP1);
+                               i386_alu_membase_reg(cd, ALU_CMP, REG_SP, src->regoff * 4, REG_ITMP1);
+                               M_BAE(0);
+                               codegen_addreference(cd, (basicblock *) iptr->target, cd->mcodeptr);
                        }                       
                        break;
 
                /* (value xx 0) ? IFxx_ICONST : ELSE_ICONST                           */
 
                case ICMD_ELSE_ICONST:  /* handled by IFxx_ICONST                     */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
                        break;
 
                case ICMD_IFEQ_ICONST:  /* ..., value ==> ..., constant               */
                                        /* val.i = constant                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ifcc_iconst(I386_CC_NE, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ifcc_iconst(cd, I386_CC_NE, src, iptr);
                        break;
 
                case ICMD_IFNE_ICONST:  /* ..., value ==> ..., constant               */
                                        /* val.i = constant                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ifcc_iconst(I386_CC_E, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ifcc_iconst(cd, I386_CC_E, src, iptr);
                        break;
 
                case ICMD_IFLT_ICONST:  /* ..., value ==> ..., constant               */
                                        /* val.i = constant                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ifcc_iconst(I386_CC_GE, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ifcc_iconst(cd, I386_CC_GE, src, iptr);
                        break;
 
                case ICMD_IFGE_ICONST:  /* ..., value ==> ..., constant               */
                                        /* val.i = constant                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ifcc_iconst(I386_CC_L, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ifcc_iconst(cd, I386_CC_L, src, iptr);
                        break;
 
                case ICMD_IFGT_ICONST:  /* ..., value ==> ..., constant               */
                                        /* val.i = constant                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ifcc_iconst(I386_CC_LE, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ifcc_iconst(cd, I386_CC_LE, src, iptr);
                        break;
 
                case ICMD_IFLE_ICONST:  /* ..., value ==> ..., constant               */
                                        /* val.i = constant                           */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
-                       d = reg_of_var(iptr->dst, REG_NULL);
-                       i386_emit_ifcc_iconst(I386_CC_G, src, iptr);
+                       d = reg_of_var(rd, iptr->dst, REG_NULL);
+                       i386_emit_ifcc_iconst(cd, I386_CC_G, src, iptr);
                        break;
 
 
                case ICMD_IRETURN:      /* ..., retvalue ==> ...                      */
-               case ICMD_ARETURN:
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL */
 
-#ifdef USE_THREADS
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               i386_mov_membase_reg(REG_SP, 8 * maxmemuse, REG_ITMP1);
-                               i386_alu_imm_reg(I386_SUB, 4, REG_SP);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, 0);
-                               i386_mov_imm_reg((s4) asm_builtin_monitorexit, REG_ITMP1);
-                               i386_call_reg(REG_ITMP1);
-                               i386_alu_imm_reg(I386_ADD, 4, REG_SP);
-                       }
-#endif
                        var_to_reg_int(s1, src, REG_RESULT);
                        M_INTMOVE(s1, REG_RESULT);
                        goto nowperformreturn;
 
                case ICMD_LRETURN:      /* ..., retvalue ==> ...                      */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
-#ifdef USE_THREADS
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               i386_mov_membase_reg(REG_SP, 8 * maxmemuse, REG_ITMP1);
-                               i386_alu_imm_reg(I386_SUB, 4, REG_SP);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, 0);
-                               i386_mov_imm_reg((s4) builtin_monitorexit, REG_ITMP1);
-                               i386_call_reg(REG_ITMP1);
-                               i386_alu_imm_reg(I386_ADD, 4, REG_SP);
-                       }
-#endif
                        if (src->flags & INMEMORY) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_RESULT);
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_RESULT2);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4, REG_RESULT);
+                               i386_mov_membase_reg(cd, REG_SP, src->regoff * 4 + 4, REG_RESULT2);
 
                        } else {
-                               panic("LRETURN: longs have to be in memory");
+                               log_text("LRETURN: longs have to be in memory");
+                               assert(0);
                        }
                        goto nowperformreturn;
 
-               case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
+               case ICMD_ARETURN:      /* ..., retvalue ==> ...                      */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL */
 
-#ifdef USE_THREADS
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               i386_mov_membase_reg(REG_SP, 8 * maxmemuse, REG_ITMP1);
-                               i386_alu_imm_reg(I386_SUB, 4, REG_SP);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, 0);
-                               i386_mov_imm_reg((s4) builtin_monitorexit, REG_ITMP1);
-                               i386_call_reg(REG_ITMP1);
-                               i386_alu_imm_reg(I386_ADD, 4, REG_SP);
+                       var_to_reg_int(s1, src, REG_RESULT);
+                       M_INTMOVE(s1, REG_RESULT);
+
+#ifdef ENABLE_VERIFIER
+                       if (iptr->val.a) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_athrow_areturn,
+                                                                       (unresolved_class *) iptr->val.a, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
                        }
-#endif
-                       var_to_reg_flt(s1, src, REG_FRESULT);
-                       /* this may be an early return -- keep the offset correct for the remaining code */
-                       fpu_st_offset--;
+#endif /* ENABLE_VERIFIER */
                        goto nowperformreturn;
 
-               case ICMD_DRETURN:      /* ..., retvalue ==> ...                      */
+               case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
+               case ICMD_DRETURN:
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL */
 
-#ifdef USE_THREADS
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               i386_mov_membase_reg(REG_SP, 8 * maxmemuse, REG_ITMP1);
-                               i386_alu_imm_reg(I386_SUB, 4, REG_SP);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, 0);
-                               i386_mov_imm_reg((s4) builtin_monitorexit, REG_ITMP1);
-                               i386_call_reg(REG_ITMP1);
-                               i386_alu_imm_reg(I386_ADD, 4, REG_SP);
-                       }
-#endif
                        var_to_reg_flt(s1, src, REG_FRESULT);
-                       /* this may be an early return -- keep the offset correct for the remaining code */
+                       /* this may be an early return -- keep the offset correct for the
+                          remaining code */
                        fpu_st_offset--;
                        goto nowperformreturn;
 
                case ICMD_RETURN:      /* ...  ==> ...                                */
-
-#ifdef USE_THREADS
-                       if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
-                               i386_mov_membase_reg(REG_SP, 8 * maxmemuse, REG_ITMP1);
-                               i386_alu_imm_reg(I386_SUB, 4, REG_SP);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, 0);
-                               i386_mov_imm_reg((s4) builtin_monitorexit, REG_ITMP1);
-                               i386_call_reg(REG_ITMP1);
-                               i386_alu_imm_reg(I386_ADD, 4, REG_SP);
-                       }
-#endif
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
 
 nowperformreturn:
                        {
-                       int r, p;
+                       s4 i, p;
                        
                        p = parentargs_base;
                        
-                       /* restore saved registers                                        */
-                       for (r = savintregcnt - 1; r >= maxsavintreguse; r--) {
-                               p--;
-                               i386_mov_membase_reg(REG_SP, p * 8, savintregs[r]);
+                       /* call trace function */
+                       if (runverbose) {
+                               i386_alu_imm_reg(cd, ALU_SUB, 4 + 8 + 8 + 4, REG_SP);
+
+                               i386_mov_imm_membase(cd, (s4) m, REG_SP, 0);
+
+                               i386_mov_reg_membase(cd, REG_RESULT, REG_SP, 4);
+                               i386_mov_reg_membase(cd, REG_RESULT2, REG_SP, 4 + 4);
+                               
+                               i386_fstl_membase(cd, REG_SP, 4 + 8);
+                               i386_fsts_membase(cd, REG_SP, 4 + 8 + 8);
+
+                               i386_mov_imm_reg(cd, (s4) builtin_displaymethodstop, REG_ITMP1);
+                               i386_call_reg(cd, REG_ITMP1);
+
+                               i386_mov_membase_reg(cd, REG_SP, 4, REG_RESULT);
+                               i386_mov_membase_reg(cd, REG_SP, 4 + 4, REG_RESULT2);
+
+                               i386_alu_imm_reg(cd, ALU_ADD, 4 + 8 + 8 + 4, REG_SP);
                        }
-                       for (r = savfltregcnt - 1; r >= maxsavfltreguse; r--) {
-                               p--;
-                               i386_fldl_membase(REG_SP, p * 8);
-                               fpu_st_offset++;
-                               if (iptr->opc == ICMD_FRETURN || iptr->opc == ICMD_DRETURN) {
-                                       i386_fstp_reg(savfltregs[r] + fpu_st_offset + 1);
-                               } else {
-                                       i386_fstp_reg(savfltregs[r] + fpu_st_offset);
+
+#if defined(USE_THREADS)
+                       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+                               M_ALD(REG_ITMP2, REG_SP, rd->memuse * 4);
+
+                               /* we need to save the proper return value */
+                               switch (iptr->opc) {
+                               case ICMD_IRETURN:
+                               case ICMD_ARETURN:
+                                       M_IST(REG_RESULT, REG_SP, rd->memuse * 4);
+                                       break;
+
+                               case ICMD_LRETURN:
+                                       M_IST(REG_RESULT, REG_SP, rd->memuse * 4);
+                                       M_IST(REG_RESULT2, REG_SP, rd->memuse * 4 + 4);
+                                       break;
+
+                               case ICMD_FRETURN:
+                                       i386_fstps_membase(cd, REG_SP, rd->memuse * 4);
+                                       break;
+
+                               case ICMD_DRETURN:
+                                       i386_fstpl_membase(cd, REG_SP, rd->memuse * 4);
+                                       break;
                                }
-                               fpu_st_offset--;
-                       }
 
-                       /* deallocate stack                                               */
-                       if (parentargs_base) {
-                               i386_alu_imm_reg(I386_ADD, parentargs_base * 8, REG_SP);
-                       }
+                               M_AST(REG_ITMP2, REG_SP, 0);
+                               M_MOV_IMM((ptrint) BUILTIN_monitorexit, REG_ITMP1);
+                               M_CALL(REG_ITMP1);
 
-                       /* call trace function */
-                       if (runverbose) {
-                               i386_alu_imm_reg(I386_SUB, 4 + 8 + 8 + 4, REG_SP);
+                               /* and now restore the proper return value */
+                               switch (iptr->opc) {
+                               case ICMD_IRETURN:
+                               case ICMD_ARETURN:
+                                       M_ILD(REG_RESULT, REG_SP, rd->memuse * 4);
+                                       break;
 
-                               i386_mov_imm_membase((s4) method, REG_SP, 0);
+                               case ICMD_LRETURN:
+                                       M_ILD(REG_RESULT, REG_SP, rd->memuse * 4);
+                                       M_ILD(REG_RESULT2, REG_SP, rd->memuse * 4 + 4);
+                                       break;
 
-                               i386_mov_reg_membase(REG_RESULT, REG_SP, 4);
-                               i386_mov_reg_membase(REG_RESULT2, REG_SP, 4 + 4);
-                               
-                               i386_fstl_membase(REG_SP, 4 + 8);
-                               i386_fsts_membase(REG_SP, 4 + 8 + 8);
+                               case ICMD_FRETURN:
+                                       i386_flds_membase(cd, REG_SP, rd->memuse * 4);
+                                       break;
+
+                               case ICMD_DRETURN:
+                                       i386_fldl_membase(cd, REG_SP, rd->memuse * 4);
+                                       break;
+                               }
+                       }
+#endif
 
-                               i386_mov_imm_reg((s4) builtin_displaymethodstop, REG_ITMP1);
-/*                             i386_mov_imm_reg(asm_builtin_exittrace, REG_ITMP1); */
-                               i386_call_reg(REG_ITMP1);
+                       /* restore saved registers */
 
-                               i386_mov_membase_reg(REG_SP, 4, REG_RESULT);
-                               i386_mov_membase_reg(REG_SP, 4 + 4, REG_RESULT2);
+                       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+                               p--; M_ALD(rd->savintregs[i], REG_SP, p * 4);
+                       }
 
-                               i386_alu_imm_reg(I386_ADD, 4 + 8 + 8 + 4, REG_SP);
+                       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+                               p--;
+                               i386_fldl_membase(cd, REG_SP, p * 4);
+                               fpu_st_offset++;
+                               if (iptr->opc == ICMD_FRETURN || iptr->opc == ICMD_DRETURN) {
+                                       i386_fstp_reg(cd, rd->savfltregs[i] + fpu_st_offset + 1);
+                               } else {
+                                       i386_fstp_reg(cd, rd->savfltregs[i] + fpu_st_offset);
+                               }
+                               fpu_st_offset--;
                        }
 
-                       i386_ret();
-                       ALIGNCODENOP;
+                       /* deallocate stack */
+
+                       if (parentargs_base)
+                               M_AADD_IMM(parentargs_base * 4, REG_SP);
+
+                       i386_ret(cd);
                        }
                        break;
 
 
                case ICMD_TABLESWITCH:  /* ..., index ==> ...                         */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
                        {
                                s4 i, l, *s4ptr;
                                void **tptr;
@@ -3901,42 +4255,40 @@ nowperformreturn:
                                var_to_reg_int(s1, src, REG_ITMP1);
                                M_INTMOVE(s1, REG_ITMP1);
                                if (l != 0) {
-                                       i386_alu_imm_reg(I386_SUB, l, REG_ITMP1);
+                                       i386_alu_imm_reg(cd, ALU_SUB, l, REG_ITMP1);
                                }
                                i = i - l + 1;
 
                 /* range check */
 
-                               i386_alu_imm_reg(I386_CMP, i - 1, REG_ITMP1);
-                               i386_jcc(I386_CC_A, 0);
+                               i386_alu_imm_reg(cd, ALU_CMP, i - 1, REG_ITMP1);
+                               i386_jcc(cd, I386_CC_A, 0);
 
-                /* codegen_addreference(BlockPtrOfPC(s4ptr[0]), mcodeptr); */
-                               codegen_addreference((basicblock *) tptr[0], mcodeptr);
+                               codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
 
                                /* build jump table top down and use address of lowest entry */
 
-                /* s4ptr += 3 + i; */
                                tptr += i;
 
                                while (--i >= 0) {
-                                       /* dseg_addtarget(BlockPtrOfPC(*--s4ptr)); */
-                                       dseg_addtarget((basicblock *) tptr[0]); 
+                                       dseg_addtarget(cd, (basicblock *) tptr[0]); 
                                        --tptr;
                                }
 
                                /* length of dataseg after last dseg_addtarget is used by load */
 
-                               i386_mov_imm_reg(0, REG_ITMP2);
-                               dseg_adddata(mcodeptr);
-                               i386_mov_memindex_reg(-dseglen, REG_ITMP2, REG_ITMP1, 2, REG_ITMP1);
-                               i386_jmp_reg(REG_ITMP1);
-                               ALIGNCODENOP;
+                               i386_mov_imm_reg(cd, 0, REG_ITMP2);
+                               dseg_adddata(cd, cd->mcodeptr);
+                               i386_mov_memindex_reg(cd, -(cd->dseglen), REG_ITMP2, REG_ITMP1, 2, REG_ITMP1);
+                               i386_jmp_reg(cd, REG_ITMP1);
                        }
                        break;
 
 
                case ICMD_LOOKUPSWITCH: /* ..., key ==> ...                           */
-                       {
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: YES EDX: YES OUTPUT: REG_NULL*/ 
+                       {
                                s4 i, l, val, *s4ptr;
                                void **tptr;
 
@@ -3953,189 +4305,234 @@ nowperformreturn:
                                        ++tptr;
 
                                        val = s4ptr[0];
-                                       i386_alu_imm_reg(I386_CMP, val, s1);
-                                       i386_jcc(I386_CC_E, 0);
-                                       /* codegen_addreference(BlockPtrOfPC(s4ptr[1]), mcodeptr); */
-                                       codegen_addreference((basicblock *) tptr[0], mcodeptr); 
+                                       i386_alu_imm_reg(cd, ALU_CMP, val, s1);
+                                       i386_jcc(cd, I386_CC_E, 0);
+                                       codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr); 
                                }
 
-                               i386_jmp_imm(0);
-                               /* codegen_addreference(BlockPtrOfPC(l), mcodeptr); */
+                               i386_jmp_imm(cd, 0);
                        
                                tptr = (void **) iptr->target;
-                               codegen_addreference((basicblock *) tptr[0], mcodeptr);
-
-                               ALIGNCODENOP;
+                               codegen_addreference(cd, (basicblock *) tptr[0], cd->mcodeptr);
                        }
                        break;
 
+               case ICMD_BUILTIN:      /* ..., [arg1, [arg2 ...]] ==> ...            */
+                                       /* op1 = arg count val.a = builtintable entry */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: YES EDX: YES OUTPUT: EAX*/
 
-               case ICMD_BUILTIN3:     /* ..., arg1, arg2, arg3 ==> ...              */
-                                       /* op1 = return type, val.a = function pointer*/
-                       s3 = 3;
-                       goto gen_method;
-
-               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:/* op1 = arg count, val.a = method pointer    */
+               case ICMD_INVOKEINTERFACE:
 
-               case ICMD_INVOKEVIRTUAL:/* ..., objectref, [arg1, [arg2 ...]] ==> ... */
-                                       /* op1 = arg count, val.a = method pointer    */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: YES EDX: YES OUTPUT: EAX */
 
-               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) {
-                               if (src->varkind == ARGVAR) {
+                       for (s3 = s3 - 1; s3 >= 0; s3--, src = src->prev) {
+                               if (src->varkind == ARGVAR)
                                        continue;
-                               }
-
                                if (IS_INT_LNG_TYPE(src->type)) {
-                                       if (s3 < intreg_argnum) {
-                                               panic("No integer argument registers available!");
-
+                                       if (!md->params[s3].inmemory) {
+                                               log_text("No integer argument registers available!");
+                                               assert(0);
                                        } else {
                                                if (!IS_2_WORD_TYPE(src->type)) {
                                                        if (src->flags & INMEMORY) {
-                                                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, s3 * 8);
-
+                                                               i386_mov_membase_reg(
+                                    cd, REG_SP, src->regoff * 4, REG_ITMP1);
+                                                               i386_mov_reg_membase(
+                                    cd, REG_ITMP1, REG_SP,
+                                                                       md->params[s3].regoff * 4);
                                                        } else {
-                                                               i386_mov_reg_membase(src->regoff, REG_SP, s3 * 8);
+                                                               i386_mov_reg_membase(
+                                                               cd, src->regoff, REG_SP,
+                                                                       md->params[s3].regoff * 4);
                                                        }
 
                                                } else {
                                                        if (src->flags & INMEMORY) {
-                                                               M_LNGMEMMOVE(src->regoff, s3);
-
+                                                               M_LNGMEMMOVE(
+                                                                   src->regoff, md->params[s3].regoff);
                                                        } else {
-                                                               panic("copy arguments: longs have to be in memory");
+                                                               log_text("copy arguments: longs have to be in memory");
+                                                               assert(0);
                                                        }
                                                }
                                        }
-
                                } else {
-                                       if (s3 < fltreg_argnum) {
-                                               panic("No float argument registers available!");
-
+                                       if (!md->params[s3].inmemory) {
+                                               log_text("No float argument registers available!");
+                                               assert(0);
                                        } else {
                                                var_to_reg_flt(d, src, REG_FTMP1);
                                                if (src->type == TYPE_FLT) {
-                                                       i386_fstps_membase(REG_SP, s3 * 8);
+                                                       i386_fstps_membase(
+                                                           cd, REG_SP, md->params[s3].regoff * 4);
 
                                                } else {
-                                                       i386_fstpl_membase(REG_SP, s3 * 8);
+                                                       i386_fstpl_membase(
+                                                           cd, REG_SP, md->params[s3].regoff * 4);
                                                }
                                        }
                                }
                        } /* end of for */
 
-                       m = iptr->val.a;
                        switch (iptr->opc) {
-                               case ICMD_BUILTIN3:
-                               case ICMD_BUILTIN2:
-                               case ICMD_BUILTIN1:
+                       case ICMD_BUILTIN:
+                               disp = (ptrint) bte->fp;
+                               d = md->returntype.type;
 
-                                       a = (s4) m;
-                                       d = iptr->op1;
+                               M_MOV_IMM(disp, REG_ITMP1);
+                               M_CALL(REG_ITMP1);
 
-                                       i386_mov_imm_reg(a, REG_ITMP1);
-                                       i386_call_reg(REG_ITMP1);
-                                       break;
+                               /* if op1 == true, we need to check for an exception */
 
-                               case ICMD_INVOKESTATIC:
+                               if (iptr->op1 == true) {
+                                       M_TEST(REG_RESULT);
+                                       M_BEQ(0);
+                                       codegen_addxexceptionrefs(cd, cd->mcodeptr);
+                               }
+                               break;
 
-                                       a = (s4) m->stubroutine;
-                                       d = m->returntype;
+                       case ICMD_INVOKESPECIAL:
+                               i386_mov_membase_reg(cd, REG_SP, 0, REG_ITMP1);
+                               gen_nullptr_check(REG_ITMP1);
 
-                                       i386_mov_imm_reg(a, REG_ITMP2);
-                                       i386_call_reg(REG_ITMP2);
-                                       break;
+                               /* access memory for hardware nullptr */
+                               i386_mov_membase_reg(cd, REG_ITMP1, 0, REG_ITMP1);
 
-                               case ICMD_INVOKESPECIAL:
+                               /* fall through */
 
-                                       a = (s4) m->stubroutine;
-                                       d = m->returntype;
+                       case ICMD_INVOKESTATIC:
+                               if (lm == NULL) {
+                                       unresolved_method *um = iptr->target;
 
-                                       i386_mov_membase_reg(REG_SP, 0, REG_ITMP1);
-                                       gen_nullptr_check(REG_ITMP1);
-                                       i386_mov_membase_reg(REG_ITMP1, 0, REG_ITMP1);    /* access memory for hardware nullptr */
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_invokestatic_special, um, 0);
 
-                                       i386_mov_imm_reg(a, REG_ITMP2);
-                                       i386_call_reg(REG_ITMP2);
-                                       break;
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                       }
 
-                               case ICMD_INVOKEVIRTUAL:
+                                       disp = 0;
+                                       d = md->returntype.type;
 
-                                       d = m->returntype;
+                               } else {
+                                       disp = (ptrint) lm->stubroutine;
+                                       d = lm->parseddesc->returntype.type;
+                               }
 
-                                       i386_mov_membase_reg(REG_SP, 0, REG_ITMP1);
-                                       gen_nullptr_check(REG_ITMP1);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(java_objectheader, vftbl), REG_ITMP2);
-                                       i386_mov_membase32_reg(REG_ITMP2, OFFSET(vftbl, table[0]) + sizeof(methodptr) * m->vftblindex, REG_ITMP1);
+                               M_MOV_IMM(disp, REG_ITMP2);
+                               M_CALL(REG_ITMP2);
+                               break;
 
-                                       i386_call_reg(REG_ITMP1);
-                                       break;
+                       case ICMD_INVOKEVIRTUAL:
+                               M_ALD(REG_ITMP1, REG_SP, 0 * 4);
+                               gen_nullptr_check(REG_ITMP1);
 
-                               case ICMD_INVOKEINTERFACE:
+                               if (lm == NULL) {
+                                       unresolved_method *um = iptr->target;
 
-                                       ci = m->class;
-                                       d = m->returntype;
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_invokevirtual, um, 0);
 
-                                       i386_mov_membase_reg(REG_SP, 0, REG_ITMP1);
-                                       gen_nullptr_check(REG_ITMP1);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(java_objectheader, vftbl), REG_ITMP1);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(vftbl, interfacetable[0]) - sizeof(methodptr) * ci->index, REG_ITMP2);
-                                       i386_mov_membase32_reg(REG_ITMP2, sizeof(methodptr) * (m - ci->methods), REG_ITMP1);
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                       }
 
-                                       i386_call_reg(REG_ITMP1);
-                                       break;
+                                       s1 = 0;
+                                       d = md->returntype.type;
 
-                               default:
-                                       d = 0;
-                                       error("Unkown ICMD-Command: %d", iptr->opc);
+                               } else {
+                                       s1 = OFFSET(vftbl_t, table[0]) +
+                                               sizeof(methodptr) * lm->vftblindex;
+                                       d = md->returntype.type;
+                               }
+
+                               M_ALD(REG_ITMP2, REG_ITMP1, OFFSET(java_objectheader, vftbl));
+                               i386_mov_membase32_reg(cd, REG_ITMP2, s1, REG_ITMP1);
+                               M_CALL(REG_ITMP1);
+                               break;
+
+                       case ICMD_INVOKEINTERFACE:
+                               M_ALD(REG_ITMP1, REG_SP, 0 * 4);
+                               gen_nullptr_check(REG_ITMP1);
+
+                               if (lm == NULL) {
+                                       unresolved_method *um = iptr->target;
+
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_invokeinterface, um, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                       }
+
+                                       s1 = 0;
+                                       s2 = 0;
+                                       d = md->returntype.type;
+
+                               } else {
+                                       s1 = OFFSET(vftbl_t, interfacetable[0]) -
+                                               sizeof(methodptr) * lm->class->index;
+
+                                       s2 = sizeof(methodptr) * (lm - lm->class->methods);
+
+                                       d = md->returntype.type;
                                }
 
+                               M_ALD(REG_ITMP1, REG_ITMP1, OFFSET(java_objectheader, vftbl));
+                               i386_mov_membase32_reg(cd, REG_ITMP1, s1, REG_ITMP2);
+                               i386_mov_membase32_reg(cd, REG_ITMP2, s2, REG_ITMP1);
+                               M_CALL(REG_ITMP1);
+                               break;
+                       }
+
                        /* d contains return type */
 
                        if (d != TYPE_VOID) {
-                               d = reg_of_var(iptr->dst, REG_NULL);
+                               d = reg_of_var(rd, iptr->dst, REG_NULL);
 
                                if (IS_INT_LNG_TYPE(iptr->dst->type)) {
                                        if (IS_2_WORD_TYPE(iptr->dst->type)) {
                                                if (iptr->dst->flags & INMEMORY) {
-                                                       i386_mov_reg_membase(REG_RESULT, REG_SP, iptr->dst->regoff * 8);
-                                                       i386_mov_reg_membase(REG_RESULT2, REG_SP, iptr->dst->regoff * 8 + 4);
-
+                                                       i386_mov_reg_membase(
+                                cd, REG_RESULT, REG_SP, iptr->dst->regoff * 4);
+                                                       i386_mov_reg_membase(
+                                cd, REG_RESULT2, REG_SP,
+                                                               iptr->dst->regoff * 4 + 4);
                                                } else {
-                                                       panic("RETURN: longs have to be in memory");
+                                                       log_text("RETURN: longs have to be in memory");
+                                                       assert(0);
                                                }
 
                                        } else {
                                                if (iptr->dst->flags & INMEMORY) {
-                                                       i386_mov_reg_membase(REG_RESULT, REG_SP, iptr->dst->regoff * 8);
+                                                       i386_mov_reg_membase(cd, REG_RESULT, REG_SP, iptr->dst->regoff * 4);
 
                                                } else {
                                                        M_INTMOVE(REG_RESULT, iptr->dst->regoff);
@@ -4148,396 +4545,509 @@ gen_method: {
                                        store_reg_to_var_flt(iptr->dst, d);
                                }
                        }
-                       }
                        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));
- */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: YES ECX: I|YES EDX: I|YES OUTPUT: REG_NULL */
 
-                       {
-                       classinfo *super = (classinfo*) iptr->val.a;
-                       
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(iptr->dst, REG_ITMP3);
-                       if (s1 == d) {
-                               M_INTMOVE(s1, REG_ITMP1);
-                               s1 = REG_ITMP1;
-                       }
-                       i386_alu_reg_reg(I386_XOR, d, d);
-                       if (iptr->op1) {                               /* class/interface */
-                               if (super->flags & ACC_INTERFACE) {        /* interface       */
-                                       i386_test_reg_reg(s1, s1);
+                       /*  superclass is an interface:
+                        *
+                        *  OK if ((sub == NULL) ||
+                        *         (sub->vftbl->interfacetablelength > super->index) &&
+                        *         (sub->vftbl->interfacetable[-super->index] != NULL));
+                        *
+                        *  superclass is a class:
+                        *
+                        *  OK if ((sub == NULL) || (0
+                        *         <= (sub->vftbl->baseval - super->vftbl->baseval) <=
+                        *         super->vftbl->diffval));
+                        */
 
-                                       /* TODO: clean up this calculation */
-                                       a = 2;
-                                       CALCOFFSETBYTES(a, s1, OFFSET(java_objectheader, vftbl));
+                       if (iptr->op1 == 1) {
+                               /* object type cast-check */
 
-                                       a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP1, OFFSET(vftbl, interfacetablelength));
-                                       
-                                       a += 2;
-/*                                     CALCOFFSETBYTES(a, super->index); */
-                                       CALCIMMEDIATEBYTES(a, super->index);
-                                       
-                                       a += 3;
-                                       a += 6;
+                               classinfo *super;
+                               vftbl_t   *supervftbl;
+                               s4         superindex;
 
-                                       a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP1, OFFSET(vftbl, interfacetable[0]) - super->index * sizeof(methodptr*));
+                               super = (classinfo *) iptr->val.a;
 
-                                       a += 3;
+                               if (!super) {
+                                       superindex = 0;
+                                       supervftbl = NULL;
 
-                                       a += 6;    /* jcc */
-                                       a += 5;
+                               } else {
+                                       superindex = super->index;
+                                       supervftbl = super->vftbl;
+                               }
+                       
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                               codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
+#endif
+                               var_to_reg_int(s1, src, REG_ITMP1);
 
-                                       i386_jcc(I386_CC_E, a);
+                               /* calculate interface checkcast code size */
 
-                                       i386_mov_membase_reg(s1, OFFSET(java_objectheader, vftbl), REG_ITMP1);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(vftbl, interfacetablelength), REG_ITMP2);
-                                       i386_alu_imm_reg(I386_SUB, super->index, REG_ITMP2);
-                                       /* TODO: test */
-                                       i386_alu_imm_reg(I386_CMP, 0, REG_ITMP2);
+                               s2 = 2; /* mov_membase_reg */
+                               CALCOFFSETBYTES(s2, s1, OFFSET(java_objectheader, vftbl));
 
-                                       /* TODO: clean up this calculation */
-                                       a = 0;
-                                       a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP1, OFFSET(vftbl, interfacetable[0]) - super->index * sizeof(methodptr*));
+                               s2 += (2 + 4 /* mov_membase32_reg */ + 2 + 4 /* sub imm32 */ +
+                                          2 /* test */ + 6 /* jcc */ + 2 + 4 /* mov_membase32_reg */ +
+                                          2 /* test */ + 6 /* jcc */);
 
-                                       a += 3;
+                               if (!super)
+                                       s2 += (opt_showdisassemble ? 5 : 0);
 
-                                       a += 6;    /* jcc */
-                                       a += 5;
+                               /* calculate class checkcast code size */
 
-                                       i386_jcc(I386_CC_LE, a);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(vftbl, interfacetable[0]) - super->index * sizeof(methodptr*), REG_ITMP1);
-                                       /* TODO: test */
-                                       i386_alu_imm_reg(I386_CMP, 0, REG_ITMP1);
-/*                                     i386_setcc_reg(I386_CC_A, d); */
-/*                                     i386_jcc(I386_CC_BE, 5); */
-                                       i386_jcc(I386_CC_E, 5);
-                                       i386_mov_imm_reg(1, d);
-                                       
+                               s3 = 2; /* mov_membase_reg */
+                               CALCOFFSETBYTES(s3, s1, OFFSET(java_objectheader, vftbl));
 
-                               } else {                                   /* class           */
-                                       i386_test_reg_reg(s1, s1);
+                               s3 += 5 /* mov_imm_reg */ + 2 + 4 /* mov_membase32_reg */;
 
-                                       /* TODO: clean up this calculation */
-                                       a = 2;
-                                       CALCOFFSETBYTES(a, s1, OFFSET(java_objectheader, vftbl));
-                                       a += 5;
+#if 0
+                               if (s1 != REG_ITMP1) {
                                        a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP1, OFFSET(vftbl, baseval));
+                                       CALCOFFSETBYTES(a, REG_ITMP3, OFFSET(vftbl_t, baseval));
+                               
                                        a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP2, OFFSET(vftbl, baseval));
-                                       
+                                       CALCOFFSETBYTES(a, REG_ITMP3, OFFSET(vftbl_t, diffval));
+                               
                                        a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP2, OFFSET(vftbl, diffval));
-                                       
-                                       a += 2;
-                                       a += 2;    /* xor */
+                               
+                               } else
+#endif
+                                       {
+                                               s3 += (2 + 4 /* mov_membase32_reg */ + 2 /* sub */ +
+                                                          5 /* mov_imm_reg */ + 2 /* mov_membase_reg */);
+                                               CALCOFFSETBYTES(s3, REG_ITMP3, OFFSET(vftbl_t, diffval));
+                                       }
 
-                                       a += 2;
+                               s3 += 2 /* cmp */ + 6 /* jcc */;
 
-                                       a += 6;    /* jcc */
-                                       a += 5;
+                               if (!super)
+                                       s3 += (opt_showdisassemble ? 5 : 0);
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       a += 32 + (s1==REG_ITMP1)*2 + (d==REG_ITMP3)*2;
-#endif
+                               /* if class is not resolved, check which code to call */
 
-                                       i386_jcc(I386_CC_E, a);
+                               if (!super) {
+                                       i386_test_reg_reg(cd, s1, s1);
+                                       i386_jcc(cd, I386_CC_Z, 5 + (opt_showdisassemble ? 5 : 0) + 6 + 6 + s2 + 5 + s3);
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       i386_mov_imm_reg(1, REG_ITMP2);
-                                       i386_lock();
-                                       i386_xadd_reg_mem(REG_ITMP2, (u4) &cast_counter);
-                                       i386_jcc(I386_CC_E, 6 + (s1==REG_ITMP1)*2 + (d==REG_ITMP3)*2);
-                                       if (s1 == REG_ITMP1)
-                                               i386_push_reg(REG_ITMP1);
-                                       i386_call_mem((s4) &castlockptr);
-                                       if (s1 == REG_ITMP1)
-                                               i386_pop_reg(REG_ITMP1);
-                                       if (d == REG_ITMP3)
-                                               i386_alu_reg_reg(I386_XOR, d, d);
-#endif
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_checkcast_instanceof_flags,
+                                                                               (constant_classref *) iptr->target, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                       }
+
+                                       i386_mov_imm_reg(cd, 0, REG_ITMP2); /* super->flags */
+                                       i386_alu_imm_reg(cd, ALU_AND, ACC_INTERFACE, REG_ITMP2);
+                                       i386_jcc(cd, I386_CC_Z, s2 + 5);
+                               }
+
+                               /* interface checkcast code */
+
+                               if (!super || (super->flags & ACC_INTERFACE)) {
+                                       if (super) {
+                                               i386_test_reg_reg(cd, s1, s1);
+                                               i386_jcc(cd, I386_CC_Z, s2);
+                                       }
 
-                                       i386_mov_membase_reg(s1, OFFSET(java_objectheader, vftbl), REG_ITMP1);
-                                       i386_mov_imm_reg((s4) super->vftbl, REG_ITMP2);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(vftbl, baseval), REG_ITMP1);
-                                       i386_mov_membase_reg(REG_ITMP2, OFFSET(vftbl, baseval), REG_ITMP3);
-                                       i386_mov_membase_reg(REG_ITMP2, OFFSET(vftbl, diffval), REG_ITMP2);
-                                       i386_alu_reg_reg(I386_SUB, REG_ITMP3, REG_ITMP1);
-                                       i386_alu_reg_reg(I386_XOR, d, d);
+                                       i386_mov_membase_reg(cd, s1,
+                                                                                OFFSET(java_objectheader, vftbl),
+                                                                                REG_ITMP2);
 
+                                       if (!super) {
+                                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                                       PATCHER_checkcast_instanceof_interface,
+                                                                                       (constant_classref *) iptr->target, 0);
+
+                                               if (opt_showdisassemble) {
+                                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                               }
+                                       }
+
+                                       i386_mov_membase32_reg(cd, REG_ITMP2,
+                                                                                  OFFSET(vftbl_t, interfacetablelength),
+                                                                                  REG_ITMP3);
+                                       i386_alu_imm32_reg(cd, ALU_SUB, superindex, REG_ITMP3);
+                                       i386_test_reg_reg(cd, REG_ITMP3, REG_ITMP3);
+                                       i386_jcc(cd, I386_CC_LE, 0);
+                                       codegen_addxcastrefs(cd, cd->mcodeptr);
+                                       i386_mov_membase32_reg(cd, REG_ITMP2,
+                                                                                  OFFSET(vftbl_t, interfacetable[0]) -
+                                                                                  superindex * sizeof(methodptr*),
+                                                                                  REG_ITMP3);
+                                       i386_test_reg_reg(cd, REG_ITMP3, REG_ITMP3);
+                                       i386_jcc(cd, I386_CC_E, 0);
+                                       codegen_addxcastrefs(cd, cd->mcodeptr);
+
+                                       if (!super)
+                                               i386_jmp_imm(cd, s3);
+                               }
+
+                               /* class checkcast code */
+
+                               if (!super || !(super->flags & ACC_INTERFACE)) {
+                                       if (super) {
+                                               i386_test_reg_reg(cd, s1, s1);
+                                               i386_jcc(cd, I386_CC_Z, s3);
+                                       }
+
+                                       i386_mov_membase_reg(cd, s1,
+                                                                                OFFSET(java_objectheader, vftbl),
+                                                                                REG_ITMP2);
+
+                                       if (!super) {
+                                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                                       PATCHER_checkcast_class,
+                                                                                       (constant_classref *) iptr->target, 0);
+
+                                               if (opt_showdisassemble) {
+                                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                               }
+                                       }
+
+                                       i386_mov_imm_reg(cd, (ptrint) supervftbl, REG_ITMP3);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                                       codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
+#endif
+                                       i386_mov_membase32_reg(cd, REG_ITMP2,
+                                                                                  OFFSET(vftbl_t, baseval),
+                                                                                  REG_ITMP2);
+
+                                       /*                              if (s1 != REG_ITMP1) { */
+                                       /*                                      i386_mov_membase_reg(cd, REG_ITMP3, OFFSET(vftbl_t, baseval), REG_ITMP1); */
+                                       /*                                      i386_mov_membase_reg(cd, REG_ITMP3, OFFSET(vftbl_t, diffval), REG_ITMP3); */
+                                       /* #if defined(USE_THREADS) && defined(NATIVE_THREADS) */
+                                       /*                                      codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase); */
+                                       /* #endif */
+                                       /*                                      i386_alu_reg_reg(cd, ALU_SUB, REG_ITMP1, REG_ITMP2); */
+
+                                       /*                              } else { */
+                                       i386_mov_membase32_reg(cd, REG_ITMP3,
+                                                                                  OFFSET(vftbl_t, baseval),
+                                                                                  REG_ITMP3);
+                                       i386_alu_reg_reg(cd, ALU_SUB, REG_ITMP3, REG_ITMP2);
+                                       i386_mov_imm_reg(cd, (ptrint) supervftbl, REG_ITMP3);
+                                       i386_mov_membase_reg(cd, REG_ITMP3,
+                                                                                OFFSET(vftbl_t, diffval),
+                                                                                REG_ITMP3);
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       i386_lock();
-                                       i386_dec_mem((s4) &cast_counter);
+                                       codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
 #endif
+                                       /*                              } */
 
-                                       i386_alu_reg_reg(I386_CMP, REG_ITMP2, REG_ITMP1);
-                                       i386_jcc(I386_CC_A, 5);
-                                       i386_mov_imm_reg(1, d);
+                                       i386_alu_reg_reg(cd, ALU_CMP, REG_ITMP3, REG_ITMP2);
+                                       i386_jcc(cd, I386_CC_A, 0);    /* (u) REG_ITMP2 > (u) REG_ITMP3 -> jump */
+                                       codegen_addxcastrefs(cd, cd->mcodeptr);
                                }
+                               d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+
+                       } else {
+                               /* array type cast-check */
+
+                               var_to_reg_int(s1, src, REG_ITMP1);
+                               M_AST(s1, REG_SP, 0 * 4);
+
+                               if (iptr->val.a == NULL) {
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_builtin_arraycheckcast,
+                                                                               iptr->target, 0);
+
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                                       }
+                               }
+
+                               M_AST_IMM((ptrint) iptr->val.a, REG_SP, 1 * 4);
+                               M_MOV_IMM((ptrint) BUILTIN_arraycheckcast, REG_ITMP3);
+                               M_CALL(REG_ITMP3);
+                               M_TEST(REG_RESULT);
+                               M_BEQ(0);
+                               codegen_addxcastrefs(cd, cd->mcodeptr);
+
+                               var_to_reg_int(s1, src, REG_ITMP1);
+                               d = reg_of_var(rd, iptr->dst, s1);
                        }
-                       else
-                               panic ("internal error: no inlined array instanceof");
-                       }
-                       store_reg_to_var_int(iptr->dst, d);
+                       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));
- */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|D|YES ECX: YES S|D|EDX: S|D|YES OUTPUT: REG_NULL*/
+                       /* ????? Really necessary to block all ?????              */
+
+                       /*  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;
+                       }
                        
-                       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       */
-                                       i386_test_reg_reg(s1, s1);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                       codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
+#endif
+
+                       var_to_reg_int(s1, src, REG_ITMP1);
+                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+                       if (s1 == d) {
+                               M_INTMOVE(s1, REG_ITMP1);
+                               s1 = REG_ITMP1;
+                       }
 
-                                       /* TODO: clean up this calculation */
-                                       a = 2;
-                                       CALCOFFSETBYTES(a, s1, OFFSET(java_objectheader, vftbl));
+                       /* calculate interface instanceof code size */
 
-                                       a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP1, OFFSET(vftbl, interfacetablelength));
+                       s2 = 2; /* mov_membase_reg */
+                       CALCOFFSETBYTES(s2, s1, OFFSET(java_objectheader, vftbl));
 
-                                       a += 2;
-/*                                     CALCOFFSETBYTES(a, super->index); */
-                                       CALCIMMEDIATEBYTES(a, super->index);
+                       s2 += (2 + 4 /* mov_membase32_reg */ + 2 + 4 /* alu_imm32_reg */ +
+                                  2 /* test */ + 6 /* jcc */ + 2 + 4 /* mov_membase32_reg */ +
+                                  2 /* test */ + 6 /* jcc */ + 5 /* mov_imm_reg */);
 
-                                       a += 3;
-                                       a += 6;
+                       if (!super)
+                               s2 += (opt_showdisassemble ? 5 : 0);
 
-                                       a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP1, OFFSET(vftbl, interfacetable[0]) - super->index * sizeof(methodptr*));
+                       /* calculate class instanceof code size */
 
-                                       a += 3;
-                                       a += 6;
+                       s3 = 2; /* mov_membase_reg */
+                       CALCOFFSETBYTES(s3, s1, OFFSET(java_objectheader, vftbl));
+                       s3 += 5; /* mov_imm_reg */
+                       s3 += 2;
+                       CALCOFFSETBYTES(s3, REG_ITMP1, OFFSET(vftbl_t, baseval));
+                       s3 += 2;
+                       CALCOFFSETBYTES(s3, REG_ITMP2, OFFSET(vftbl_t, diffval));
+                       s3 += 2;
+                       CALCOFFSETBYTES(s3, REG_ITMP2, OFFSET(vftbl_t, baseval));
 
-                                       i386_jcc(I386_CC_E, a);
+                       s3 += (2 /* alu_reg_reg */ + 2 /* alu_reg_reg */ +
+                                  2 /* alu_reg_reg */ + 6 /* jcc */ + 5 /* mov_imm_reg */);
 
-                                       i386_mov_membase_reg(s1, OFFSET(java_objectheader, vftbl), REG_ITMP1);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(vftbl, interfacetablelength), REG_ITMP2);
-                                       i386_alu_imm_reg(I386_SUB, super->index, REG_ITMP2);
-                                       /* TODO: test */
-                                       i386_alu_imm_reg(I386_CMP, 0, REG_ITMP2);
-                                       i386_jcc(I386_CC_LE, 0);
-                                       codegen_addxcastrefs(mcodeptr);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(vftbl, interfacetable[0]) - super->index * sizeof(methodptr*), REG_ITMP2);
-                                       /* TODO: test */
-                                       i386_alu_imm_reg(I386_CMP, 0, REG_ITMP2);
-                                       i386_jcc(I386_CC_E, 0);
-                                       codegen_addxcastrefs(mcodeptr);
+                       if (!super)
+                               s3 += (opt_showdisassemble ? 5 : 0);
 
-                               } else {                                     /* class           */
-                                       i386_test_reg_reg(s1, s1);
+                       i386_alu_reg_reg(cd, ALU_XOR, d, d);
 
-                                       /* TODO: clean up this calculation */
-                                       a = 2;
-                                       CALCOFFSETBYTES(a, s1, OFFSET(java_objectheader, vftbl));
+                       /* if class is not resolved, check which code to call */
 
-                                       a += 5;
+                       if (!super) {
+                               i386_test_reg_reg(cd, s1, s1);
+                               i386_jcc(cd, I386_CC_Z, 5 + (opt_showdisassemble ? 5 : 0) + 6 + 6 + s2 + 5 + s3);
 
-                                       a += 2;
-                                       CALCOFFSETBYTES(a, REG_ITMP1, OFFSET(vftbl, baseval));
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_checkcast_instanceof_flags,
+                                                                       (constant_classref *) iptr->target, 0);
 
-                                       if (d != REG_ITMP3) {
-                                               a += 2;
-                                               CALCOFFSETBYTES(a, REG_ITMP2, OFFSET(vftbl, baseval));
-                                               
-                                               a += 2;
-                                               CALCOFFSETBYTES(a, REG_ITMP2, OFFSET(vftbl, diffval));
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
 
-                                               a += 2;
-                                               
-                                       } else {
-                                               a += 2;
-                                               CALCOFFSETBYTES(a, REG_ITMP2, OFFSET(vftbl, baseval));
+                               i386_mov_imm_reg(cd, 0, REG_ITMP3); /* super->flags */
+                               i386_alu_imm32_reg(cd, ALU_AND, ACC_INTERFACE, REG_ITMP3);
+                               i386_jcc(cd, I386_CC_Z, s2 + 5);
+                       }
+
+                       /* interface instanceof code */
+
+                       if (!super || (super->flags & ACC_INTERFACE)) {
+                               if (super) {
+                                       M_TEST(s1);
+                                       M_BEQ(s2);
+                               }
 
-                                               a += 2;
+                               i386_mov_membase_reg(cd, s1,
+                                                                        OFFSET(java_objectheader, vftbl),
+                                                                        REG_ITMP1);
 
-                                               a += 5;
+                               if (!super) {
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_checkcast_instanceof_interface,
+                                                                               (constant_classref *) iptr->target, 0);
 
-                                               a += 2;
-                                               CALCOFFSETBYTES(a, REG_ITMP2, OFFSET(vftbl, diffval));
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
                                        }
+                               }
 
-                                       a += 2;
+                               i386_mov_membase32_reg(cd, REG_ITMP1,
+                                                                          OFFSET(vftbl_t, interfacetablelength),
+                                                                          REG_ITMP3);
+                               i386_alu_imm32_reg(cd, ALU_SUB, superindex, REG_ITMP3);
+                               i386_test_reg_reg(cd, REG_ITMP3, REG_ITMP3);
 
-                                       a += 6;
+                               disp = (2 + 4 /* mov_membase32_reg */ + 2 /* test */ +
+                                               6 /* jcc */ + 5 /* mov_imm_reg */);
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       a += 32 + (s1==REG_ITMP3)*2;
-#endif
+                               M_BLE(disp);
+                               i386_mov_membase32_reg(cd, REG_ITMP1,
+                                                                          OFFSET(vftbl_t, interfacetable[0]) -
+                                                                          superindex * sizeof(methodptr*),
+                                                                          REG_ITMP1);
+                               M_TEST(REG_ITMP1);
+/*                                     i386_setcc_reg(cd, I386_CC_A, d); */
+/*                                     i386_jcc(cd, I386_CC_BE, 5); */
+                               M_BEQ(5);
+                               M_MOV_IMM(1, d);
 
-                                       i386_jcc(I386_CC_E, a);
+                               if (!super)
+                                       M_JMP_IMM(s3);
+                       }
 
+                       /* class instanceof code */
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       i386_mov_imm_reg(1, REG_ITMP2);
-                                       i386_lock();
-                                       i386_xadd_reg_mem(REG_ITMP2, (u4) &cast_counter);
-                                       i386_jcc(I386_CC_E, 6 + (s1==REG_ITMP3)*2);
-                                       if (s1 == REG_ITMP3)
-                                               i386_push_reg(REG_ITMP3);
-                                       i386_call_mem((s4) &castlockptr);
-                                       if (s1 == REG_ITMP3)
-                                               i386_pop_reg(REG_ITMP3);
-#endif
+                       if (!super || !(super->flags & ACC_INTERFACE)) {
+                               if (super) {
+                                       M_TEST(s1);
+                                       M_BEQ(s3);
+                               }
 
+                               i386_mov_membase_reg(cd, s1,
+                                                                        OFFSET(java_objectheader, vftbl),
+                                                                        REG_ITMP1);
 
-                                       i386_mov_membase_reg(s1, OFFSET(java_objectheader, vftbl), REG_ITMP1);
-                                       i386_mov_imm_reg((s4) super->vftbl, REG_ITMP2);
-                                       i386_mov_membase_reg(REG_ITMP1, OFFSET(vftbl, baseval), REG_ITMP1);
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       codegen_threadcritstart(mcodeptr - mcodebase);
-#endif
-                                       if (d != REG_ITMP3) {
-                                               i386_mov_membase_reg(REG_ITMP2, OFFSET(vftbl, baseval), REG_ITMP3);
-                                               i386_mov_membase_reg(REG_ITMP2, OFFSET(vftbl, diffval), REG_ITMP2);
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                               codegen_threadcritstop(mcodeptr - mcodebase);
-#endif
-                                               i386_alu_reg_reg(I386_SUB, REG_ITMP3, REG_ITMP1);
+                               if (!super) {
+                                       codegen_addpatchref(cd, cd->mcodeptr,
+                                                                               PATCHER_instanceof_class,
+                                                                               (constant_classref *) iptr->target, 0);
 
-                                       } else {
-                                               i386_mov_membase_reg(REG_ITMP2, OFFSET(vftbl, baseval), REG_ITMP2);
-                                               i386_alu_reg_reg(I386_SUB, REG_ITMP2, REG_ITMP1);
-                                               i386_mov_imm_reg((s4) super->vftbl, REG_ITMP2);
-                                               i386_mov_membase_reg(REG_ITMP2, OFFSET(vftbl, diffval), REG_ITMP2);
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                               codegen_threadcritstop(mcodeptr - mcodebase);
-#endif
+                                       if (opt_showdisassemble) {
+                                               M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
                                        }
+                               }
 
+                               i386_mov_imm_reg(cd, (ptrint) supervftbl, REG_ITMP2);
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       i386_lock();
-                                       i386_dec_mem((s4) &cast_counter);
+                               codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
 #endif
-                                       
-                                       i386_alu_reg_reg(I386_CMP, REG_ITMP2, REG_ITMP1);
-                                       i386_jcc(I386_CC_A, 0);    /* (u) REG_ITMP1 > (u) REG_ITMP2 -> jump */
-                                       codegen_addxcastrefs(mcodeptr);
-                               }
-
-                       } else
-                               panic ("internal error: no inlined array checkcast");
+                               i386_mov_membase_reg(cd, REG_ITMP1,
+                                                                        OFFSET(vftbl_t, baseval),
+                                                                        REG_ITMP1);
+                               i386_mov_membase_reg(cd, REG_ITMP2,
+                                                                        OFFSET(vftbl_t, diffval),
+                                                                        REG_ITMP3);
+                               i386_mov_membase_reg(cd, REG_ITMP2,
+                                                                        OFFSET(vftbl_t, baseval),
+                                                                        REG_ITMP2);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                               codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
+#endif
+                               i386_alu_reg_reg(cd, ALU_SUB, REG_ITMP2, REG_ITMP1);
+                               i386_alu_reg_reg(cd, ALU_XOR, d, d); /* may be REG_ITMP2 */
+                               i386_alu_reg_reg(cd, ALU_CMP, REG_ITMP3, REG_ITMP1);
+                               i386_jcc(cd, I386_CC_A, 5);
+                               i386_mov_imm_reg(cd, 1, d);
+                       }
+                       store_reg_to_var_int(iptr->dst, d);
                        }
-                       M_INTMOVE(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_CHECKASIZE:  /* ..., size ==> ..., size                     */
-
-                       if (src->flags & INMEMORY) {
-                               i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8);
-                               
-                       } else {
-                               i386_test_reg_reg(src->regoff, src->regoff);
-                       }
-                       i386_jcc(I386_CC_L, 0);
-                       codegen_addxcheckarefs(mcodeptr);
                        break;
 
                case ICMD_MULTIANEWARRAY:/* ..., cnt1, [cnt2, ...] ==> ..., arrayref  */
-                                     /* op1 = dimension, val.a = array descriptor    */
+                                     /* op1 = dimension, val.a = class               */
+                       /* REG_RES Register usage: see icmd_uses_reg_res.inc */
+                       /* EAX: S|YES ECX: YES EDX: YES OUTPUT: EAX */
 
                        /* 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) {
-                               if (src->flags & INMEMORY) {
-                                       i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8);
-
-                               } else {
-                                       i386_test_reg_reg(src->regoff, src->regoff);
-                               }
-                               i386_jcc(I386_CC_L, 0);
-                               codegen_addxcheckarefs(mcodeptr);
-
-                               /* 
-                                * copy sizes to new stack location, be cause native function
-                                * builtin_nmultianewarray access them as (int *)
-                                */
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, -(iptr->op1 - s1) * 4);
-
-                               /* copy sizes to stack (argument numbers >= INT_ARG_CNT)      */
+                               /* copy SAVEDVAR sizes to stack */
 
                                if (src->varkind != ARGVAR) {
                                        if (src->flags & INMEMORY) {
-                                               i386_mov_membase_reg(REG_SP, (src->regoff + intreg_argnum) * 8, REG_ITMP1);
-                                               i386_mov_reg_membase(REG_ITMP1, REG_SP, (s1 + intreg_argnum) * 8);
+                                               M_ILD(REG_ITMP1, REG_SP, src->regoff * 4);
+                                               M_IST(REG_ITMP1, REG_SP, (s1 + 3) * 4);
 
                                        } else {
-                                               i386_mov_reg_membase(src->regoff, REG_SP, (s1 + intreg_argnum) * 8);
+                                               M_IST(src->regoff, REG_SP, (s1 + 3) * 4);
                                        }
                                }
                        }
-                       i386_alu_imm_reg(I386_SUB, iptr->op1 * 4, REG_SP);
 
-                       /* a0 = dimension count */
+                       /* is a patcher function set? */
+
+                       if (iptr->val.a == NULL) {
+                               codegen_addpatchref(cd, cd->mcodeptr,
+                                                                       PATCHER_builtin_multianewarray,
+                                                                       (constant_classref *) iptr->target, 0);
+
+                               if (opt_showdisassemble) {
+                                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
+                               }
+
+                               disp = 0;
+
+                       } else {
+                               disp = (ptrint) iptr->val.a;
+                       }
 
-                       /* save stack pointer */
-                       M_INTMOVE(REG_SP, REG_ITMP1);
+                       /* a0 = dimension count */
 
-                       i386_alu_imm_reg(I386_SUB, 12, REG_SP);
-                       i386_mov_imm_membase(iptr->op1, REG_SP, 0);
+                       M_IST_IMM(iptr->op1, REG_SP, 0 * 4);
 
                        /* a1 = arraydescriptor */
 
-                       i386_mov_imm_membase((s4) iptr->val.a, REG_SP, 4);
+                       M_IST_IMM(disp, REG_SP, 1 * 4);
 
                        /* a2 = pointer to dimensions = stack pointer */
 
-                       i386_mov_reg_membase(REG_ITMP1, REG_SP, 8);
+                       M_MOV(REG_SP, REG_ITMP1);
+                       M_AADD_IMM(3 * 4, REG_ITMP1);
+                       M_AST(REG_ITMP1, REG_SP, 2 * 4);
+
+                       M_MOV_IMM((ptrint) BUILTIN_multianewarray, REG_ITMP1);
+                       M_CALL(REG_ITMP1);
+
+                       /* check for exception before result assignment */
 
-                       i386_mov_imm_reg((s4) (builtin_nmultianewarray), REG_ITMP1);
-                       i386_call_reg(REG_ITMP1);
-                       i386_alu_imm_reg(I386_ADD, 12 + iptr->op1 * 4, REG_SP);
+                       M_TEST(REG_RESULT);
+                       M_BEQ(0);
+                       codegen_addxexceptionrefs(cd, cd->mcodeptr);
 
-                       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);
                        break;
 
                default:
-                       error ("Unknown pseudo command: %d", iptr->opc);
+                       *exceptionptr =
+                               new_internalerror("Unknown ICMD %d", iptr->opc);
+                       return false;
        } /* switch */
                
        } /* for instruction */
@@ -4547,1687 +5057,802 @@ gen_method: {
        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_FLTMOVE(s1,interfaces[len][s2].regoff);
+                               if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+                                       M_FLTMOVE(s1, rd->interfaces[len][s2].regoff);
 
                                } else {
-                                       panic("double store");
-/*                                     M_DST(s1, REG_SP, 8 * interfaces[len][s2].regoff); */
+                                       log_text("double store");
+                                       assert(0);
+/*                                     M_DST(s1, REG_SP, 4 * interfaces[len][s2].regoff); */
                                }
 
                        } else {
                                var_to_reg_int(s1, src, REG_ITMP1);
-                               if (!IS_2_WORD_TYPE(interfaces[len][s2].type)) {
-                                       if (!(interfaces[len][s2].flags & INMEMORY)) {
-                                               M_INTMOVE(s1, interfaces[len][s2].regoff);
+                               if (!IS_2_WORD_TYPE(rd->interfaces[len][s2].type)) {
+                                       if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+                                               M_INTMOVE(s1, rd->interfaces[len][s2].regoff);
 
                                        } else {
-                                               i386_mov_reg_membase(s1, REG_SP, interfaces[len][s2].regoff * 8);
+                                               i386_mov_reg_membase(cd, s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
                                        }
 
                                } else {
-                                       if (interfaces[len][s2].flags & INMEMORY) {
-                                               M_LNGMEMMOVE(s1, interfaces[len][s2].regoff);
+                                       if (rd->interfaces[len][s2].flags & INMEMORY) {
+                                               M_LNGMEMMOVE(s1, rd->interfaces[len][s2].regoff);
 
                                        } else {
-                                               panic("copy interface registers: longs have to be in memory (end)");
+                                               log_text("copy interface registers: longs have to be in memory (end)");
+                                               assert(0);
                                        }
                                }
                        }
                }
                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 (cd->mcodeptr < cd->lastmcodeptr) {
+               while (cd->mcodeptr < cd->lastmcodeptr) {
+                       M_NOP;
+               }
+       }
+
        } /* if (bptr -> flags >= BBREACHED) */
        } /* for basic block */
 
-       /* bptr -> mpc = (int)((u1*) mcodeptr - mcodebase); */
+       dseg_createlinenumbertable(cd);
 
        {
 
-       /* generate bound check stubs */
-       u1 *xcodeptr = NULL;
-       
-       for (; xboundrefs != NULL; xboundrefs = xboundrefs->next) {
-               if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1*) mcodebase + xboundrefs->branchpos, 
-                                                         xboundrefs->branchpos,
-                                                         (u1*) xcodeptr - (u1*) mcodebase - (5 + 5 + 2));
-                       continue;
-               }
+       u1        *xcodeptr;
+       branchref *bref;
 
+       /* generate ArithmeticException stubs */
 
-               gen_resolvebranch((u1*) mcodebase + xboundrefs->branchpos, 
-                                 xboundrefs->branchpos, (u1*) mcodeptr - mcodebase);
+       xcodeptr = NULL;
+       
+       for (bref = cd->xdivrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch(cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 cd->mcodeptr - cd->mcodebase);
 
-               MCODECHECK(8);
+               MCODECHECK(512);
 
-               i386_mov_imm_reg(0, REG_ITMP2_XPC);    /* 5 bytes */
-               dseg_adddata(mcodeptr);
-               i386_mov_imm_reg(xboundrefs->branchpos - 6, REG_ITMP1);    /* 5 bytes */
-               i386_alu_reg_reg(I386_ADD, REG_ITMP1, REG_ITMP2_XPC);    /* 2 bytes */
+               M_MOV_IMM(0, REG_ITMP2_XPC);
+               dseg_adddata(cd, cd->mcodeptr);
+               M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC);
 
                if (xcodeptr != NULL) {
-                       i386_jmp_imm(((u1 *) xcodeptr - (u1 *) mcodeptr) - 5);
-
+                       M_JMP_IMM((xcodeptr - cd->mcodeptr) - 5);
+               
                } else {
-                       xcodeptr = mcodeptr;
+                       xcodeptr = cd->mcodeptr;
+
+                       M_ASUB_IMM(4 * 4, REG_SP);
+
+                       M_AST_IMM(0, REG_SP, 0 * 4);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_MOV(REG_SP, REG_ITMP3);
+                       M_AADD_IMM(4 * 4, REG_ITMP3);
+                       M_AST(REG_ITMP3, REG_SP, 1 * 4);
+                       M_ALD(REG_ITMP3, REG_SP, (4 + parentargs_base) * 4);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 4);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 3 * 4);
+
+                       M_MOV_IMM((ptrint) stacktrace_inline_arithmeticexception,
+                                         REG_ITMP3);
+                       M_CALL(REG_ITMP3);
 
-                       i386_mov_imm_reg((s4) proto_java_lang_ArrayIndexOutOfBoundsException, REG_ITMP1_XPTR);
-                       i386_mov_imm_reg((s4) asm_handle_exception, REG_ITMP3);
-                       i386_jmp_reg(REG_ITMP3);
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 3 * 4);
+                       M_AADD_IMM(4 * 4, REG_SP);
+
+                       M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
                }
        }
 
-       /* generate negative array size check stubs */
+       /* generate ArrayIndexOutOfBoundsException 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 - (5 + 5 + 2));
-                       continue;
-               }
 
-               gen_resolvebranch((u1*) mcodebase + xcheckarefs->branchpos, 
-                                 xcheckarefs->branchpos, (u1*) mcodeptr - mcodebase);
+       for (bref = cd->xboundrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch(cd->mcodebase + bref->branchpos,
+                                 bref->branchpos,
+                                                 cd->mcodeptr - cd->mcodebase);
+
+               MCODECHECK(512);
 
-               MCODECHECK(8);
+               /* move index register into REG_ITMP1 */
 
-               i386_mov_imm_reg(0, REG_ITMP2_XPC);    /* 5 bytes */
-               dseg_adddata(mcodeptr);
-               i386_mov_imm_reg(xcheckarefs->branchpos - 6, REG_ITMP1);    /* 5 bytes */
-               i386_alu_reg_reg(I386_ADD, REG_ITMP1, REG_ITMP2_XPC);    /* 2 bytes */
+               M_INTMOVE(bref->reg, REG_ITMP1);
+
+               M_MOV_IMM(0, REG_ITMP2_XPC);
+               dseg_adddata(cd, cd->mcodeptr);
+               M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC);
 
                if (xcodeptr != NULL) {
-                       i386_jmp_imm(((u1 *) xcodeptr - (u1 *) mcodeptr) - 5);
+                       M_JMP_IMM((xcodeptr - cd->mcodeptr) - 5);
 
                } else {
-                       xcodeptr = mcodeptr;
+                       xcodeptr = cd->mcodeptr;
+
+                       M_ASUB_IMM(5 * 4, REG_SP);
 
-                       i386_mov_imm_reg((s4) proto_java_lang_NegativeArraySizeException, REG_ITMP1_XPTR);
-                       i386_mov_imm_reg((s4) asm_handle_exception, REG_ITMP3);
-                       i386_jmp_reg(REG_ITMP3);
+                       M_AST_IMM(0, REG_SP, 0 * 4);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_MOV(REG_SP, REG_ITMP3);
+                       M_AADD_IMM(5 * 4, REG_ITMP3);
+                       M_AST(REG_ITMP3, REG_SP, 1 * 4);
+                       M_ALD(REG_ITMP3, REG_SP, (5 + parentargs_base) * 4);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 4);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 3 * 4);
+                       M_AST(REG_ITMP1, REG_SP, 4 * 4); /* don't use REG_ITMP1 till here */
+
+                       M_MOV_IMM((ptrint) stacktrace_inline_arrayindexoutofboundsexception,
+                                         REG_ITMP3);
+                       M_CALL(REG_ITMP3);
+
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 3 * 4);
+                       M_AADD_IMM(5 * 4, REG_SP);
+
+                       M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
                }
        }
 
-       /* generate cast check stubs */
+       /* generate ArrayStoreException 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 - (5 + 5 + 2));
-                       continue;
-               }
+       for (bref = cd->xstorerefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch(cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 cd->mcodeptr - cd->mcodebase);
 
-               gen_resolvebranch((u1*) mcodebase + xcastrefs->branchpos, 
-                                 xcastrefs->branchpos, (u1*) mcodeptr - mcodebase);
+               MCODECHECK(512);
 
-               MCODECHECK(8);
-
-               i386_mov_imm_reg(0, REG_ITMP2_XPC);    /* 5 bytes */
-               dseg_adddata(mcodeptr);
-               i386_mov_imm_reg(xcastrefs->branchpos - 6, REG_ITMP1);    /* 5 bytes */
-               i386_alu_reg_reg(I386_ADD, REG_ITMP1, REG_ITMP2_XPC);    /* 2 bytes */
+               M_MOV_IMM(0, REG_ITMP2_XPC);
+               dseg_adddata(cd, cd->mcodeptr);
+               M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC);
 
                if (xcodeptr != NULL) {
-                       i386_jmp_imm(((u1 *) xcodeptr - (u1 *) mcodeptr) - 5);
-               
+                       M_JMP_IMM((xcodeptr - cd->mcodeptr) - 5);
+
                } else {
-                       xcodeptr = mcodeptr;
+                       xcodeptr = cd->mcodeptr;
+
+                       M_ASUB_IMM(4 * 4, REG_SP);
+
+                       M_AST_IMM(0, REG_SP, 0 * 4);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_MOV(REG_SP, REG_ITMP3);
+                       M_AADD_IMM(4 * 4, REG_ITMP3);
+                       M_AST(REG_ITMP3, REG_SP, 1 * 4);
+                       M_ALD(REG_ITMP3, REG_SP, (4 + parentargs_base) * 4);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 4);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 3 * 4);
+
+                       M_MOV_IMM((ptrint) stacktrace_inline_arraystoreexception,
+                                         REG_ITMP3);
+                       M_CALL(REG_ITMP3);
 
-                       i386_mov_imm_reg((s4) proto_java_lang_ClassCastException, REG_ITMP1_XPTR);
-                       i386_mov_imm_reg((s4) asm_handle_exception, REG_ITMP3);
-                       i386_jmp_reg(REG_ITMP3);
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 3 * 4);
+                       M_AADD_IMM(4 * 4, REG_SP);
+
+                       M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
                }
        }
 
-       /* generate divide by zero check stubs */
+       /* generate ClassCastException stubs */
+
        xcodeptr = NULL;
        
-       for (; xdivrefs != NULL; xdivrefs = xdivrefs->next) {
-               if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1*) mcodebase + xdivrefs->branchpos, 
-                                                         xdivrefs->branchpos,
-                                                         (u1*) xcodeptr - (u1*) mcodebase - (5 + 5 + 2));
-                       continue;
-               }
+       for (bref = cd->xcastrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch(cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 cd->mcodeptr - cd->mcodebase);
 
-               gen_resolvebranch((u1*) mcodebase + xdivrefs->branchpos, 
-                                 xdivrefs->branchpos, (u1*) mcodeptr - mcodebase);
+               MCODECHECK(512);
 
-               MCODECHECK(8);
-
-               i386_mov_imm_reg(0, REG_ITMP2_XPC);    /* 5 bytes */
-               dseg_adddata(mcodeptr);
-               i386_mov_imm_reg(xdivrefs->branchpos - 6, REG_ITMP1);    /* 5 bytes */
-               i386_alu_reg_reg(I386_ADD, REG_ITMP1, REG_ITMP2_XPC);    /* 2 bytes */
+               M_MOV_IMM(0, REG_ITMP2_XPC);
+               dseg_adddata(cd, cd->mcodeptr);
+               M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC);
 
                if (xcodeptr != NULL) {
-                       i386_jmp_imm(((u1 *) xcodeptr - (u1 *) mcodeptr) - 5);
+                       M_JMP_IMM((xcodeptr - cd->mcodeptr) - 5);
                
                } else {
-                       xcodeptr = mcodeptr;
+                       xcodeptr = cd->mcodeptr;
+
+                       M_ASUB_IMM(4 * 4, REG_SP);
+
+                       M_AST_IMM(0, REG_SP, 0 * 4);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_MOV(REG_SP, REG_ITMP3);
+                       M_AADD_IMM(4 * 4, REG_ITMP3);
+                       M_AST(REG_ITMP3, REG_SP, 1 * 4);
+                       M_ALD(REG_ITMP3, REG_SP, (4 + parentargs_base) * 4);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 4);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 3 * 4);
+
+                       M_MOV_IMM((ptrint) stacktrace_inline_classcastexception, REG_ITMP3);
+                       M_CALL(REG_ITMP3);
 
-                       i386_mov_imm_reg((s4) proto_java_lang_ArithmeticException, REG_ITMP1_XPTR);
-                       i386_mov_imm_reg((s4) asm_handle_exception, REG_ITMP3);
-                       i386_jmp_reg(REG_ITMP3);
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 3 * 4);
+                       M_AADD_IMM(4 * 4, REG_SP);
+
+                       M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
                }
        }
 
-       /* generate null pointer check stubs */
+       /* generate NullPointerException stubs */
+
        xcodeptr = NULL;
        
-       for (; xnullrefs != NULL; xnullrefs = xnullrefs->next) {
-               if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1*) mcodebase + xnullrefs->branchpos, 
-                                                         xnullrefs->branchpos,
-                                                         (u1*) xcodeptr - (u1*) mcodebase - (5 + 5 + 2));
-                       continue;
-               }
-
-               gen_resolvebranch((u1*) mcodebase + xnullrefs->branchpos, 
-                                                 xnullrefs->branchpos, (u1*) mcodeptr - mcodebase);
+       for (bref = cd->xnullrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch(cd->mcodebase + bref->branchpos, 
+                                                 bref->branchpos,
+                                                 cd->mcodeptr - cd->mcodebase);
                
-               MCODECHECK(8);
+               MCODECHECK(512);
 
-               i386_mov_imm_reg(0, REG_ITMP2_XPC);    /* 5 bytes */
-               dseg_adddata(mcodeptr);
-               i386_mov_imm_reg(xnullrefs->branchpos - 6, REG_ITMP1);    /* 5 bytes */
-               i386_alu_reg_reg(I386_ADD, REG_ITMP1, REG_ITMP2_XPC);    /* 2 bytes */
+               M_MOV_IMM(0, REG_ITMP2_XPC);
+               dseg_adddata(cd, cd->mcodeptr);
+               M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC);
                
                if (xcodeptr != NULL) {
-                       i386_jmp_imm(((u1 *) xcodeptr - (u1 *) mcodeptr) - 5);
+                       M_JMP_IMM((xcodeptr - cd->mcodeptr) - 5);
                        
                } else {
-                       xcodeptr = mcodeptr;
+                       xcodeptr = cd->mcodeptr;
                        
-                       i386_mov_imm_reg((s4) proto_java_lang_NullPointerException, REG_ITMP1_XPTR);
-                       i386_mov_imm_reg((s4) asm_handle_exception, REG_ITMP3);
-                       i386_jmp_reg(REG_ITMP3);
+                       M_ASUB_IMM(4 * 4, REG_SP);
+
+                       M_AST_IMM(0, REG_SP, 0 * 4);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_MOV(REG_SP, REG_ITMP3);
+                       M_AADD_IMM(4 * 4, REG_ITMP3);
+                       M_AST(REG_ITMP3, REG_SP, 1 * 4);
+                       M_ALD(REG_ITMP3, REG_SP, (4 + parentargs_base) * 4);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 4);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 3 * 4);
+
+                       M_MOV_IMM((ptrint) stacktrace_inline_nullpointerexception,
+                                         REG_ITMP3);
+                       M_CALL(REG_ITMP3);
+
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 3 * 4);
+                       M_AADD_IMM(4 * 4, REG_SP);
+
+                       M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
                }
        }
-       }
 
-       codegen_finish((int)((u1*) mcodeptr - mcodebase));
-}
+       /* generate exception check stubs */
 
+       xcodeptr = NULL;
+       
+       for (bref = cd->xexceptionrefs; bref != NULL; bref = bref->next) {
+               gen_resolvebranch(cd->mcodebase + bref->branchpos, 
+                                 bref->branchpos,
+                                                 cd->mcodeptr - cd->mcodebase);
 
-/* function createcompilerstub *************************************************
+               MCODECHECK(512);
 
-   creates a stub routine which calls the compiler
-       
-*******************************************************************************/
+               M_MOV_IMM(0, REG_ITMP2_XPC);
+               dseg_adddata(cd, cd->mcodeptr);
+               M_AADD_IMM32(bref->branchpos - 6, REG_ITMP2_XPC);
 
-#define COMPSTUBSIZE 12
+               if (xcodeptr != NULL) {
+                       M_JMP_IMM((xcodeptr - cd->mcodeptr) - 5);
+               
+               } else {
+                       xcodeptr = cd->mcodeptr;
 
-u1 *createcompilerstub(methodinfo *m)
-{
-    u1 *s = CNEW(u1, COMPSTUBSIZE);     /* memory to hold the stub            */
-    mcodeptr = s;                       /* code generation pointer            */
+                       M_ASUB_IMM(4 * 4, REG_SP);
 
-    /* code for the stub */
-    i386_mov_imm_reg((s4) m, REG_ITMP1);/* pass method pointer to compiler    */
+                       M_AST_IMM(0, REG_SP, 0 * 4);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_MOV(REG_SP, REG_ITMP3);
+                       M_AADD_IMM(4 * 4, REG_ITMP3);
+                       M_AST(REG_ITMP3, REG_SP, 1 * 4);
+                       M_ALD(REG_ITMP3, REG_SP, (4 + parentargs_base) * 4);
+                       M_AST(REG_ITMP3, REG_SP, 2 * 4);
+                       M_AST(REG_ITMP2_XPC, REG_SP, 3 * 4);
 
-       /* we use REG_ITMP3 cause ECX (REG_ITMP2) is used for patching            */
-    i386_mov_imm_reg((s4) asm_call_jit_compiler, REG_ITMP3);  /* load address */
-    i386_jmp_reg(REG_ITMP3);            /* jump to compiler                   */
+                       M_MOV_IMM((ptrint) stacktrace_inline_fillInStackTrace, REG_ITMP3);
+                       M_CALL(REG_ITMP3);
 
-#ifdef STATISTICS
-    count_cstub_len += COMPSTUBSIZE;
-#endif
+                       M_ALD(REG_ITMP2_XPC, REG_SP, 3 * 4);
+                       M_AADD_IMM(4 * 4, REG_SP);
 
-    return (u1*) s;
-}
+                       M_MOV_IMM((ptrint) asm_handle_exception, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
+               }
+       }
 
+       /* generate code patching stub call code */
 
-/* function removecompilerstub *************************************************
+       {
+               patchref    *pref;
+               codegendata *tmpcd;
+               u8           mcode;
 
-     deletes a compilerstub from memory  (simply by freeing it)
+               tmpcd = DNEW(codegendata);
 
-*******************************************************************************/
+               for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
+                       /* check code segment size */
 
-void removecompilerstub(u1 *stub) 
-{
-    CFREE(stub, COMPSTUBSIZE);
-}
+                       MCODECHECK(512);
 
-/* function: createnativestub **************************************************
+                       /* Get machine code which is patched back in later. A             */
+                       /* `call rel32' is 5 bytes long.                                  */
 
-       creates a stub routine which calls a native method
+                       xcodeptr = cd->mcodebase + pref->branchpos;
+                       mcode = *((u8 *) xcodeptr);
 
-*******************************************************************************/
+                       /* patch in `call rel32' to call the following code               */
+
+                       tmpcd->mcodeptr = xcodeptr;     /* set dummy mcode pointer        */
+                       i386_call_imm(tmpcd, cd->mcodeptr - (xcodeptr + 5));
 
-#define NATIVESTUBSIZE 340
+                       /* move pointer to java_objectheader onto stack */
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-static java_objectheader *(*callgetexceptionptrptr)() = builtin_get_exceptionptrptr;
-static void (*callresetexceptionptr)() = builtin_reset_exceptionptr;
+                       (void) dseg_addaddress(cd, get_dummyLR());          /* monitorPtr */
+                       off = dseg_addaddress(cd, NULL);                    /* vftbl      */
+
+                       M_MOV_IMM(0, REG_ITMP3);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_AADD_IMM(off, REG_ITMP3);
+                       M_PUSH(REG_ITMP3);
+#else
+                       M_PUSH_IMM(0);
 #endif
 
-u1 *createnativestub(functionptr f, methodinfo *m)
-{
-    u1 *s = CNEW(u1, NATIVESTUBSIZE);   /* memory to hold the stub            */
+                       /* move machine code bytes and classinfo pointer into registers */
 
-    u1 *tptr;
-    int i;
-    int stackframesize = 4;           /* initial 4 bytes is space for jni env */
-    int stackframeoffset = 4;
+                       M_PUSH_IMM((ptrint) (mcode >> 32));
+                       M_PUSH_IMM((ptrint) mcode);
+                       M_PUSH_IMM((ptrint) pref->ref);
+                       M_PUSH_IMM((ptrint) pref->patcher);
 
-    int p, t;
+                       M_MOV_IMM((ptrint) asm_wrapper_patcher, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
+               }
+       }
+       }
+       
+       codegen_finish(m, cd, (ptrint) (cd->mcodeptr - cd->mcodebase));
 
-       mcodeptr = s;                       /* make macros work                   */
+       /* everything's ok */
 
-       if (m->flags & ACC_STATIC) {
-               stackframesize += 4;
-               stackframeoffset += 4;
-       }
+       return true;
+}
 
-    reg_init();
-    descriptor2types(m);                     /* set paramcount and paramtypes */
 
-/*SHOULD THAT BE OPTIMIZED FOR THE NOTHREAD CASE ?? */
-/*CREATE STACKINFO BEGIN */
-        i386_mov_imm_reg((s4) builtin_asm_new_stackframeinfo, REG_ITMP1);
-        i386_call_reg(REG_ITMP1);
-       i386_mov_membase_reg(REG_SP, 0 , REG_ITMP2); /*save return adress*/
-       i386_mov_reg_membase(REG_RESULT,REG_SP,0); /*save thread specific stack frame info block*/
-       i386_mov_membase_reg(REG_RESULT, 0 , REG_ITMP3); /*get direct access to structure*/
-#if 0
-       i386_mov_membase_reg(REG_ITMP3,0,REG_ITMP2);/*TESTING*/
-       i386_mov_reg_membase(REG_ITMP2,REG_SP,0);/*TESTING*/
-       i386_ret(); /*TESTING*/
-#endif
-       i386_mov_reg_membase(REG_ITMP2, REG_ITMP3, offreturnfromnative); /*store return adress in stack frame info block*/
-       i386_mov_imm_membase((s4) m, REG_ITMP3, offmethodnative); /*store methodpointer in stack frame info block*/
-       i386_mov_reg_membase(REG_SP,REG_ITMP3,offaddrreturnfromnative);
+/* createcompilerstub **********************************************************
 
-#if 0
-       i386_mov_membase_reg(REG_ITMP3,0,REG_ITMP2);/*TESTING*/
-       i386_mov_reg_membase(REG_ITMP2,REG_SP,0);/*TESTING*/
-       i386_ret(); /*TESTING*/
-#endif
+   Creates a stub routine which calls the compiler.
+       
+*******************************************************************************/
 
-/*CREATE STACKINFO END */
-    if (runverbose) {
-        i386_alu_imm_reg(I386_SUB, TRACE_ARGS_NUM * 8 + 4, REG_SP);
-        
-        for (p = 0; p < m->paramcount; p++) {
-            t = m->paramtypes[p];
-            if (IS_INT_LNG_TYPE(t)) {
-                if (IS_2_WORD_TYPE(t)) {
-                    i386_mov_membase_reg(REG_SP, 4 + (TRACE_ARGS_NUM + p) * 8 + 4, REG_ITMP1);
-                    i386_mov_membase_reg(REG_SP, 4 + (TRACE_ARGS_NUM + p) * 8 + 4 + 4, REG_ITMP2);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, p * 8 + 4);
-
-                } else if (t == TYPE_ADR) {
-                    i386_mov_membase_reg(REG_SP, 4 + (TRACE_ARGS_NUM + p) * 8 + 4, REG_ITMP1);
-                    i386_alu_reg_reg(I386_XOR, REG_ITMP2, REG_ITMP2);
-                                       i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8);
-                                       i386_mov_reg_membase(REG_ITMP2, REG_SP, p * 8 + 4);
-
-                } else {
-                    i386_mov_membase_reg(REG_SP, 4 + (TRACE_ARGS_NUM + p) * 8 + 4, EAX);
-                    i386_cltd();
-                                       i386_mov_reg_membase(EAX, REG_SP, p * 8);
-                                       i386_mov_reg_membase(EDX, REG_SP, p * 8 + 4);
-                }
-
-            } else {
-                if (t == TYPE_FLT) {
-                    i386_flds_membase(REG_SP, 4 + (TRACE_ARGS_NUM + p) * 8 + 4);
-                    i386_fstps_membase(REG_SP, p * 8);
-                    i386_alu_reg_reg(I386_XOR, REG_ITMP2, REG_ITMP2);
-                    i386_mov_reg_membase(REG_ITMP2, REG_SP, p * 8 + 4);
-
-                } else {
-                    i386_fldl_membase(REG_SP, 4 + (TRACE_ARGS_NUM + p) * 8 + 4);
-                    i386_fstpl_membase(REG_SP, p * 8);
-                }
-            }
-        }
-               
-        i386_alu_reg_reg(I386_XOR, REG_ITMP1, REG_ITMP1);
-        for (p = m->paramcount; p < TRACE_ARGS_NUM; p++) {
-            i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8);
-            i386_mov_reg_membase(REG_ITMP1, REG_SP, p * 8 + 4);
-        }
+#define COMPILERSTUB_SIZE    12
 
-        i386_mov_imm_membase((s4) m, REG_SP, TRACE_ARGS_NUM * 8);
+u1 *createcompilerstub(methodinfo *m)
+{
+    u1          *s;                     /* memory to hold the stub            */
+       codegendata *cd;
+       s4           dumpsize;
 
-        i386_mov_imm_reg((s4) builtin_trace_args, REG_ITMP1);
-        i386_call_reg(REG_ITMP1);
+       s = CNEW(u1, COMPILERSTUB_SIZE);
 
-        i386_alu_imm_reg(I386_ADD, TRACE_ARGS_NUM * 8 + 4, REG_SP);
-    }
+       /* mark start of dump memory area */
 
-    /*
-        * mark the whole fpu stack as free for native functions
-        * (only for saved register count == 0)
-        */
-    i386_ffree_reg(0);
-    i386_ffree_reg(1);
-    i386_ffree_reg(2);
-    i386_ffree_reg(3);
-    i386_ffree_reg(4);
-    i386_ffree_reg(5);
-    i386_ffree_reg(6);
-    i386_ffree_reg(7);
+       dumpsize = dump_size();
+       
+       cd = DNEW(codegendata);
+    cd->mcodeptr = s;
 
-       /* calculate stackframe size for native function */
-    tptr = m->paramtypes;
-    for (i = 0; i < m->paramcount; i++) {
-        switch (*tptr++) {
-        case TYPE_INT:
-        case TYPE_FLT:
-        case TYPE_ADR:
-            stackframesize += 4;
-            break;
-
-        case TYPE_LNG:
-        case TYPE_DBL:
-            stackframesize += 8;
-            break;
-
-        default:
-            panic("unknown parameter type in native function");
-        }
-    }
+    i386_mov_imm_reg(cd, (ptrint) m, REG_ITMP1);
 
-    i386_alu_imm_reg(I386_SUB, stackframesize, REG_SP);
-
-    tptr = m->paramtypes;
-    for (i = 0; i < m->paramcount; i++) {
-        switch (*tptr++) {
-        case TYPE_INT:
-        case TYPE_FLT:
-        case TYPE_ADR:
-            i386_mov_membase_reg(REG_SP, stackframesize + (1 * 4) + i * 8, REG_ITMP1);
-            i386_mov_reg_membase(REG_ITMP1, REG_SP, stackframeoffset);
-            stackframeoffset += 4;
-            break;
-
-        case TYPE_LNG:
-        case TYPE_DBL:
-            i386_mov_membase_reg(REG_SP, stackframesize + (1 * 4) + i * 8, REG_ITMP1);
-            i386_mov_membase_reg(REG_SP, stackframesize + (1 * 4) + i * 8 + 4, REG_ITMP2);
-            i386_mov_reg_membase(REG_ITMP1, REG_SP, stackframeoffset);
-            i386_mov_reg_membase(REG_ITMP2, REG_SP, stackframeoffset + 4);
-            stackframeoffset += 8;
-            break;
-
-        default:
-            panic("unknown parameter type in native function");
-        }
-    }
+       /* we use REG_ITMP3 cause ECX (REG_ITMP2) is used for patching  */
+    i386_mov_imm_reg(cd, (ptrint) asm_call_jit_compiler, REG_ITMP3);
+    i386_jmp_reg(cd, REG_ITMP3);
 
-       if (m->flags & ACC_STATIC) {
-               i386_mov_imm_membase((s4) m->class, REG_SP, 4);
-       }
+#if defined(ENABLE_STATISTICS)
+       if (opt_stat)
+               count_cstub_len += COMPILERSTUB_SIZE;
+#endif
 
-       i386_mov_imm_membase((s4) &env, REG_SP, 0);
-
-    i386_mov_imm_reg((s4) f, REG_ITMP1);
-    i386_call_reg(REG_ITMP1);
-    i386_alu_imm_reg(I386_ADD, stackframesize, REG_SP);
-
-/*REMOVE STACKINFO BEGIN */
-/*Perhapse merge with thread code below, to avoid 2 times pushing and poping*/
-       /*save result registers*/
-       i386_push_reg(REG_RESULT);
-       i386_push_reg(REG_RESULT2);
-       i386_mov_membase_reg(REG_SP,8,REG_ITMP1); /*get stack frame info block **   */
-       i386_mov_membase_reg(REG_ITMP1,0,REG_ITMP2); /*get stack frame info block *   */
-       i386_mov_membase_reg(REG_ITMP2,offreturnfromnative,REG_ITMP3); /*get return value*/
-
-       i386_mov_reg_membase(REG_ITMP3,REG_SP,8);       /* put the correct return value where it belongs */
-       /* reduce stack frame info pseudo stack by 1 */
-       /* the memory is not freed here, since usally native methods are not nested really deep, 
-          so we reuse the block during the next call. If that linked list gets really a problem you should
-          consider writing native code instead of java code anyways */
-       i386_mov_membase_reg(REG_ITMP2,offprevnative,REG_ITMP3);
-       i386_mov_reg_membase(REG_ITMP3,REG_ITMP1,0);
-
-/*TESTING*/
-/*     i386_mov_imm_reg(0,REG_ITMP1);
-       i386_mov_reg_membase(REG_ITMP1,REG_SP,8);*/
+       /* release dump area */
 
+       dump_release(dumpsize);
        
-       /*restore result registers*/
-       i386_pop_reg(REG_RESULT2);
-       i386_pop_reg(REG_RESULT);
-
-/*REMOVE STACKINFO END */
+    return s;
+}
 
 
+/* createnativestub ************************************************************
 
-    if (runverbose) {
-        i386_alu_imm_reg(I386_SUB, 4 + 8 + 8 + 4, REG_SP);
-               
-        i386_mov_imm_membase((s4) m, REG_SP, 0);
-               
-        i386_mov_reg_membase(REG_RESULT, REG_SP, 4);
-        i386_mov_reg_membase(REG_RESULT2, REG_SP, 4 + 4);
-               
-        i386_fstl_membase(REG_SP, 4 + 8);
-        i386_fsts_membase(REG_SP, 4 + 8 + 8);
-               
-        i386_mov_imm_reg((s4) builtin_displaymethodstop, REG_ITMP1);
-        i386_call_reg(REG_ITMP1);
-               
-        i386_mov_membase_reg(REG_SP, 4, REG_RESULT);
-        i386_mov_membase_reg(REG_SP, 4 + 4, REG_RESULT2);
-               
-        i386_alu_imm_reg(I386_ADD, 4 + 8 + 8 + 4, REG_SP);
-    }
+   Creates a stub routine which calls a native method.
 
+*******************************************************************************/
 
-       /* we can't use REG_ITMP3 == REG_RESULT2 */
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       i386_push_reg(REG_RESULT);
-       i386_push_reg(REG_RESULT2);
-       i386_call_mem(&callgetexceptionptrptr);
-       i386_mov_membase_reg(REG_RESULT, 0, REG_ITMP2);
-       i386_test_reg_reg(REG_ITMP2, REG_ITMP2);
-       i386_pop_reg(REG_RESULT2);
-       i386_pop_reg(REG_RESULT);
-#else
-       i386_mov_imm_reg((s4) &_exceptionptr, REG_ITMP2);
-       i386_mov_membase_reg(REG_ITMP2, 0, REG_ITMP2);
-       i386_test_reg_reg(REG_ITMP2, REG_ITMP2);
-#endif
-       i386_jcc(I386_CC_NE, 1);
+/* this way we can call the function directly with a memory call */
 
-       i386_ret();
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       i386_push_reg(REG_ITMP2);
-       i386_call_mem(&callresetexceptionptr);
-       i386_pop_reg(REG_ITMP1_XPTR);
-#else
-       i386_mov_reg_reg(REG_ITMP2, REG_ITMP1_XPTR);
-       i386_mov_imm_reg((s4) &_exceptionptr, REG_ITMP2);
-       i386_mov_imm_membase(0, REG_ITMP2, 0);
+static java_objectheader **(*callgetexceptionptrptr)() = builtin_get_exceptionptrptr;
 #endif
-       i386_mov_membase_reg(REG_SP, 0, REG_ITMP2_XPC);
-       i386_alu_imm_reg(I386_SUB, 2, REG_ITMP2_XPC);
 
-       i386_mov_imm_reg((s4) asm_handle_nat_exception, REG_ITMP3);
-       i386_jmp_reg(REG_ITMP3);
+u1 *createnativestub(functionptr f, methodinfo *m, codegendata *cd,
+                                        registerdata *rd, methoddesc *nmd)
+{
+       methoddesc *md;
+       s4          nativeparams;
+       s4          stackframesize;
+       s4          i, j;                   /* count variables                    */
+       s4          t;
+       s4          s1, s2, disp;
 
-#ifdef STATISTICS
-       count_nstub_len += NATIVESTUBSIZE;
-#endif
+       /* set some variables */
 
-       return s;
-}
+       md = m->parseddesc;
+       nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
 
-/* function: removenativestub **************************************************
+       /* calculate stackframe size */
 
-    removes a previously created native-stub from memory
-    
-*******************************************************************************/
+       stackframesize =
+               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(localref_table) / SIZEOF_VOID_P +
+               1 +                             /* function pointer                   */
+               4 * 4 +                         /* 4 arguments (start_native_call)    */
+               nmd->memuse;
 
-void removenativestub(u1 *stub)
-{
-    CFREE(stub, NATIVESTUBSIZE);
-}
+       /* create method header */
 
+       (void) dseg_addaddress(cd, m);                          /* MethodPointer  */
+       (void) dseg_adds4(cd, stackframesize * 4);              /* 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    */
 
+       /* initialize mcode variables */
+       
+       cd->mcodeptr = (u1 *) cd->mcodebase;
+       cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
 
-void i386_emit_ialu(s4 alu_op, stackptr src, instruction *iptr)
-{
-       if (iptr->dst->flags & INMEMORY) {
-               if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       if (src->regoff == iptr->dst->regoff) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(alu_op, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+       /* generate profiling code */
 
-                       } else if (src->prev->regoff == iptr->dst->regoff) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(alu_op, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+       if (opt_prof) {
+               M_MOV_IMM((ptrint) m, REG_ITMP1);
+               M_IADD_IMM_MEMBASE(1, REG_ITMP1, OFFSET(methodinfo, executioncount));
+       }
 
-                       } else {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(alu_op, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                       }
+       /* calculate stackframe size for native function */
 
-               } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                       if (src->regoff == iptr->dst->regoff) {
-                               i386_alu_reg_membase(alu_op, src->prev->regoff, REG_SP, iptr->dst->regoff * 8);
+       M_ASUB_IMM(stackframesize * 4, REG_SP);
 
-                       } else {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_reg(alu_op, src->prev->regoff, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                       }
+       if (runverbose) {
+               s4 p, t;
 
-               } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       if (src->prev->regoff == iptr->dst->regoff) {
-                               i386_alu_reg_membase(alu_op, src->regoff, REG_SP, iptr->dst->regoff * 8);
-                                               
-                       } else {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_reg(alu_op, src->regoff, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                       }
-
-               } else {
-                       i386_mov_reg_membase(src->prev->regoff, REG_SP, iptr->dst->regoff * 8);
-                       i386_alu_reg_membase(alu_op, src->regoff, REG_SP, iptr->dst->regoff * 8);
-               }
-
-       } else {
-               if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, iptr->dst->regoff);
-                       i386_alu_membase_reg(alu_op, REG_SP, src->regoff * 8, iptr->dst->regoff);
+               disp = stackframesize * 4;
 
-               } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                       M_INTMOVE(src->prev->regoff, iptr->dst->regoff);
-                       i386_alu_membase_reg(alu_op, REG_SP, src->regoff * 8, iptr->dst->regoff);
+               M_ASUB_IMM(TRACE_ARGS_NUM * 8 + 4, REG_SP);
+    
+               for (p = 0; p < md->paramcount && p < TRACE_ARGS_NUM; p++) {
+                       t = md->paramtypes[p].type;
+                       if (IS_INT_LNG_TYPE(t)) {
+                               if (IS_2_WORD_TYPE(t)) {
+                                       M_ILD(REG_ITMP1, REG_SP,
+                                                 4 + TRACE_ARGS_NUM * 8 + 4 + disp);
+                                       M_ILD(REG_ITMP2, REG_SP,
+                                                 4 + TRACE_ARGS_NUM * 8 + 4 + disp + 4);
+                                       M_IST(REG_ITMP1, REG_SP, p * 8);
+                                       M_IST(REG_ITMP2, REG_SP, p * 8 + 4);
 
-               } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       M_INTMOVE(src->regoff, iptr->dst->regoff);
-                       i386_alu_membase_reg(alu_op, REG_SP, src->prev->regoff * 8, iptr->dst->regoff);
+                               } else if (t == TYPE_ADR) {
+                                       M_ALD(REG_ITMP1, REG_SP,
+                                                 4 + TRACE_ARGS_NUM * 8 + 4 + disp);
+                                       M_CLR(REG_ITMP2);
+                                       M_AST(REG_ITMP1, REG_SP, p * 8);
+                                       M_AST(REG_ITMP2, REG_SP, p * 8 + 4);
 
-               } else {
-                       if (src->regoff == iptr->dst->regoff) {
-                               i386_alu_reg_reg(alu_op, src->prev->regoff, iptr->dst->regoff);
+                               } else {
+                                       M_ILD(EAX, REG_SP, 4 + TRACE_ARGS_NUM * 8 + 4 + disp);
+                                       i386_cltd(cd);
+                                       M_IST(EAX, REG_SP, p * 8);
+                                       M_IST(EDX, REG_SP, p * 8 + 4);
+                               }
 
                        } else {
-                               M_INTMOVE(src->prev->regoff, iptr->dst->regoff);
-                               i386_alu_reg_reg(alu_op, src->regoff, iptr->dst->regoff);
-                       }
-               }
-       }
-}
-
+                               if (!IS_2_WORD_TYPE(t)) {
+                                       i386_flds_membase(cd, REG_SP,
+                                                                         4 + TRACE_ARGS_NUM * 8 + 4 + disp);
+                                       i386_fstps_membase(cd, REG_SP, p * 8);
+                                       i386_alu_reg_reg(cd, ALU_XOR, REG_ITMP2, REG_ITMP2);
+                                       M_IST(REG_ITMP2, REG_SP, p * 8 + 4);
 
-
-void i386_emit_ialuconst(s4 alu_op, stackptr src, instruction *iptr)
-{
-       if (iptr->dst->flags & INMEMORY) {
-               if (src->flags & INMEMORY) {
-                       if (src->regoff == iptr->dst->regoff) {
-                               i386_alu_imm_membase(alu_op, iptr->val.i, REG_SP, iptr->dst->regoff * 8);
-
-                       } else {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_imm_reg(alu_op, iptr->val.i, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                               } else {
+                                       i386_fldl_membase(cd, REG_SP,
+                                           4 + TRACE_ARGS_NUM * 8 + 4 + disp);
+                                       i386_fstpl_membase(cd, REG_SP, p * 8);
+                               }
                        }
-
-               } else {
-                       i386_mov_reg_membase(src->regoff, REG_SP, iptr->dst->regoff * 8);
-                       i386_alu_imm_membase(alu_op, iptr->val.i, REG_SP, iptr->dst->regoff * 8);
+                       disp += (IS_2_WORD_TYPE(t)) ? 8 : 4;
                }
-
-       } else {
-               if (src->flags & INMEMORY) {
-                       i386_mov_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
-                       i386_alu_imm_reg(alu_op, iptr->val.i, iptr->dst->regoff);
-
-               } else {
-                       M_INTMOVE(src->regoff, iptr->dst->regoff);
-                       i386_alu_imm_reg(alu_op, iptr->val.i, iptr->dst->regoff);
+       
+               M_CLR(REG_ITMP1);
+               for (p = md->paramcount; p < TRACE_ARGS_NUM; p++) {
+                       M_IST(REG_ITMP1, REG_SP, p * 8);
+                       M_IST(REG_ITMP1, REG_SP, p * 8 + 4);
                }
-       }
-}
 
+               M_AST_IMM((ptrint) m, REG_SP, TRACE_ARGS_NUM * 8);
 
+               M_MOV_IMM((ptrint) builtin_trace_args, REG_ITMP1);
+               M_CALL(REG_ITMP1);
 
-void i386_emit_lalu(s4 alu_op, stackptr src, instruction *iptr)
-{
-       if (iptr->dst->flags & INMEMORY) {
-               if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       if (src->regoff == iptr->dst->regoff) {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(alu_op, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_reg_membase(alu_op, REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
-
-                       } else if (src->prev->regoff == iptr->dst->regoff) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_reg_membase(alu_op, REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_reg_membase(alu_op, REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
-
-                       } else {
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_alu_membase_reg(alu_op, REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_membase_reg(alu_op, REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
-                       }
-               }
+               M_AADD_IMM(TRACE_ARGS_NUM * 8 + 4, REG_SP);
        }
-}
 
+       /* get function address (this must happen before the stackframeinfo) */
 
+#if !defined(ENABLE_STATICVM)
+       if (f == NULL) {
+               codegen_addpatchref(cd, cd->mcodeptr, PATCHER_resolve_native, m, 0);
 
-void i386_emit_laluconst(s4 alu_op, stackptr src, instruction *iptr)
-{
-       if (iptr->dst->flags & INMEMORY) {
-               if (src->flags & INMEMORY) {
-                       if (src->regoff == iptr->dst->regoff) {
-                               i386_alu_imm_membase(alu_op, iptr->val.l, REG_SP, iptr->dst->regoff * 8);
-                               i386_alu_imm_membase(alu_op, iptr->val.l >> 32, REG_SP, iptr->dst->regoff * 8 + 4);
-
-                       } else {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                               i386_alu_imm_reg(alu_op, iptr->val.l, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8 + 4, REG_ITMP1);
-                               i386_alu_imm_reg(alu_op, iptr->val.l >> 32, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8 + 4);
-                       }
+               if (opt_showdisassemble) {
+                       M_NOP; M_NOP; M_NOP; M_NOP; M_NOP;
                }
        }
-}
+#endif
 
+       M_AST_IMM((ptrint) f, REG_SP, 4 * 4);
 
+       /* Mark the whole fpu stack as free for native functions (only for saved  */
+       /* register count == 0).                                                  */
 
-void i386_emit_ishift(s4 shift_op, stackptr src, instruction *iptr)
-{
-       if (iptr->dst->flags & INMEMORY) {
-               if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       if (src->prev->regoff == iptr->dst->regoff) {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
-                               i386_shift_membase(shift_op, REG_SP, iptr->dst->regoff * 8);
+       i386_ffree_reg(cd, 0);
+       i386_ffree_reg(cd, 1);
+       i386_ffree_reg(cd, 2);
+       i386_ffree_reg(cd, 3);
+       i386_ffree_reg(cd, 4);
+       i386_ffree_reg(cd, 5);
+       i386_ffree_reg(cd, 6);
+       i386_ffree_reg(cd, 7);
 
-                       } else {
-                               i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_shift_reg(shift_op, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                       }
+       /* prepare data structures for native function call */
 
-               } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                       i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
-                       i386_mov_reg_membase(src->prev->regoff, REG_SP, iptr->dst->regoff * 8);
-                       i386_shift_membase(shift_op, REG_SP, iptr->dst->regoff * 8);
+       M_MOV(REG_SP, REG_ITMP1);
+       M_AADD_IMM(stackframesize * 4, REG_ITMP1);
 
-               } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       if (src->prev->regoff == iptr->dst->regoff) {
-                               M_INTMOVE(src->regoff, ECX);
-                               i386_shift_membase(shift_op, REG_SP, iptr->dst->regoff * 8);
+       M_AST(REG_ITMP1, REG_SP, 0 * 4);
+       M_IST_IMM(0, REG_SP, 1 * 4);
+       dseg_adddata(cd, cd->mcodeptr);
 
-                       } else {
-                               M_INTMOVE(src->regoff, ECX);
-                               i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, REG_ITMP1);
-                               i386_shift_reg(shift_op, REG_ITMP1);
-                               i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
-                       }
+       M_MOV(REG_SP, REG_ITMP2);
+       M_AADD_IMM(stackframesize * 4 + SIZEOF_VOID_P, REG_ITMP2);
 
-               } else {
-                       M_INTMOVE(src->regoff, ECX);
-                       i386_mov_reg_membase(src->prev->regoff, REG_SP, iptr->dst->regoff * 8);
-                       i386_shift_membase(shift_op, REG_SP, iptr->dst->regoff * 8);
-               }
+       M_AST(REG_ITMP2, REG_SP, 2 * 4);
+       M_ALD(REG_ITMP3, REG_SP, stackframesize * 4);
+       M_AST(REG_ITMP3, REG_SP, 3 * 4);
+       M_MOV_IMM((ptrint) codegen_start_native_call, REG_ITMP1);
+       M_CALL(REG_ITMP1);
 
-       } else {
-               if ((src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
-                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, iptr->dst->regoff);
-                       i386_shift_reg(shift_op, iptr->dst->regoff);
-
-               } else if ((src->flags & INMEMORY) && !(src->prev->flags & INMEMORY)) {
-                       i386_mov_membase_reg(REG_SP, src->regoff * 8, ECX);
-                       M_INTMOVE(src->prev->regoff, iptr->dst->regoff);
-                       i386_shift_reg(shift_op, iptr->dst->regoff);
-
-               } else if (!(src->flags & INMEMORY) && (src->prev->flags & INMEMORY)) {
-                       M_INTMOVE(src->regoff, ECX);
-                       i386_mov_membase_reg(REG_SP, src->prev->regoff * 8, iptr->dst->regoff);
-                       i386_shift_reg(shift_op, iptr->dst->regoff);
-
-               } else {
-                       M_INTMOVE(src->regoff, ECX);
-                       M_INTMOVE(src->prev->regoff, iptr->dst->regoff);
-                       i386_shift_reg(shift_op, iptr->dst->regoff);
-               }
-       }
-}
+       M_ALD(REG_ITMP3, REG_SP, 4 * 4);
 
+       /* copy arguments into new stackframe */
 
+       for (i = md->paramcount - 1, j = i + nativeparams; i >= 0; i--, j--) {
+               t = md->paramtypes[i].type;
 
-void i386_emit_ishiftconst(s4 shift_op, stackptr src, instruction *iptr)
-{
-       if ((src->flags & INMEMORY) && (iptr->dst->flags & INMEMORY)) {
-               if (src->regoff == iptr->dst->regoff) {
-                       i386_shift_imm_membase(shift_op, iptr->val.i, REG_SP, iptr->dst->regoff * 8);
+               if (!md->params[i].inmemory) {
+                       /* no integer argument registers */
+               } else {       /* float/double in memory can be copied like int/longs */
+                       s1 = (md->params[i].regoff + stackframesize + 1) * 4;
+                       s2 = nmd->params[j].regoff * 4;
 
-               } else {
-                       i386_mov_membase_reg(REG_SP, src->regoff * 8, REG_ITMP1);
-                       i386_shift_imm_reg(shift_op, iptr->val.i, REG_ITMP1);
-                       i386_mov_reg_membase(REG_ITMP1, REG_SP, iptr->dst->regoff * 8);
+                       M_ILD(REG_ITMP1, REG_SP, s1);
+                       M_IST(REG_ITMP1, REG_SP, s2);
+                       if (IS_2_WORD_TYPE(t)) {
+                               M_ILD(REG_ITMP1, REG_SP, s1 + 4);
+                               M_IST(REG_ITMP1, REG_SP, s2 + 4);
+                       }
                }
-
-       } else if ((src->flags & INMEMORY) && !(iptr->dst->flags & INMEMORY)) {
-               i386_mov_membase_reg(REG_SP, src->regoff * 8, iptr->dst->regoff);
-               i386_shift_imm_reg(shift_op, iptr->val.i, iptr->dst->regoff);
-                               
-       } else if (!(src->flags & INMEMORY) && (iptr->dst->flags & INMEMORY)) {
-               i386_mov_reg_membase(src->regoff, REG_SP, iptr->dst->regoff * 8);
-               i386_shift_imm_membase(shift_op, iptr->val.i, REG_SP, iptr->dst->regoff * 8);
-
-       } else {
-               M_INTMOVE(src->regoff, iptr->dst->regoff);
-               i386_shift_imm_reg(shift_op, iptr->val.i, iptr->dst->regoff);
        }
-}
 
+       /* if function is static, put class into second argument */
 
+       if (m->flags & ACC_STATIC)
+               M_AST_IMM((ptrint) m->class, REG_SP, 1 * 4);
 
-void i386_emit_ifcc_iconst(s4 if_op, stackptr src, instruction *iptr)
-{
-       if (iptr->dst->flags & INMEMORY) {
-               int offset = 0;
+       /* put env into first argument */
 
-               if (src->flags & INMEMORY) {
-                       i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8);
+       M_AST_IMM((ptrint) &env, REG_SP, 0 * 4);
 
-               } else {
-                       i386_test_reg_reg(src->regoff, src->regoff);
-               }
+       /* call the native function */
 
-               offset += 7;
-               CALCOFFSETBYTES(offset, REG_SP, iptr->dst->regoff * 8);
-       
-               i386_jcc(if_op, offset + (iptr[1].opc == ICMD_ELSE_ICONST) ? 5 + offset : 0);
-               i386_mov_imm_membase(iptr->val.i, REG_SP, iptr->dst->regoff * 8);
+       M_CALL(REG_ITMP3);
 
-               if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
-                       i386_jmp_imm(offset);
-                       i386_mov_imm_membase(iptr[1].val.i, REG_SP, iptr->dst->regoff * 8);
-               }
+       /* save return value */
 
+       if (IS_INT_LNG_TYPE(md->returntype.type)) {
+               if (IS_2_WORD_TYPE(md->returntype.type))
+                       M_IST(REG_RESULT2, REG_SP, 2 * 4);
+               M_IST(REG_RESULT, REG_SP, 1 * 4);
+       
        } else {
-               if (src->flags & INMEMORY) {
-                       i386_alu_imm_membase(I386_CMP, 0, REG_SP, src->regoff * 8);
-
-               } else {
-                       i386_test_reg_reg(src->regoff, src->regoff);
-               }
-
-               i386_jcc(if_op, (iptr[1].opc == ICMD_ELSE_ICONST) ? 10 : 5);
-               i386_mov_imm_reg(iptr->val.i, iptr->dst->regoff);
-
-               if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
-                       i386_jmp_imm(5);
-                       i386_mov_imm_reg(iptr[1].val.i, iptr->dst->regoff);
-               }
+               if (IS_2_WORD_TYPE(md->returntype.type))
+                       i386_fstl_membase(cd, REG_SP, 1 * 4);
+               else
+                       i386_fsts_membase(cd, REG_SP, 1 * 4);
        }
-}
-
-
-
-/*
- * mov ops
- */
-void i386_mov_reg_reg(s4 reg, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x89;
-       i386_emit_reg((reg),(dreg));
-}
-
 
-void i386_mov_imm_reg(s4 imm, s4 reg) {
-       *(mcodeptr++) = (u1) 0xb8 + ((reg) & 0x07);
-       i386_emit_imm32((imm));
-}
-
-
-void i386_movb_imm_reg(s4 imm, s4 reg) {
-       *(mcodeptr++) = (u1) 0xc6;
-       i386_emit_reg(0,(reg));
-       i386_emit_imm8((imm));
-}
-
-
-void i386_mov_membase_reg(s4 basereg, s4 disp, s4 reg) {
-       *(mcodeptr++) = (u1) 0x8b;
-       i386_emit_membase((basereg),(disp),(reg));
-}
-
-
-/*
- * this one is for INVOKEVIRTUAL/INVOKEINTERFACE to have a
- * constant membase immediate length of 32bit
- */
-void i386_mov_membase32_reg(s4 basereg, s4 disp, s4 reg) {
-       *(mcodeptr++) = (u1) 0x8b;
-       i386_address_byte(2, (reg), (basereg));
-       i386_emit_imm32((disp));
-}
-
-
-void i386_mov_reg_membase(s4 reg, s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0x89;
-       i386_emit_membase((basereg),(disp),(reg));
-}
+       /* remove data structures for native function call */
 
+       M_MOV(REG_SP, REG_ITMP1);
+       M_AADD_IMM(stackframesize * 4, REG_ITMP1);
 
-void i386_mov_memindex_reg(s4 disp, s4 basereg, s4 indexreg, s4 scale, s4 reg) {
-       *(mcodeptr++) = (u1) 0x8b;
-       i386_emit_memindex((reg),(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_mov_reg_memindex(s4 reg, s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0x89;
-       i386_emit_memindex((reg),(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_mov_mem_reg(s4 mem, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x8b;
-       i386_emit_mem((dreg),(mem));
-}
-
+       M_AST(REG_ITMP1, REG_SP, 0 * 4);
+       M_MOV_IMM((ptrint) codegen_finish_native_call, REG_ITMP1);
+       M_CALL(REG_ITMP1);
 
-void i386_movw_reg_memindex(s4 reg, s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0x66;
-       *(mcodeptr++) = (u1) 0x89;
-       i386_emit_memindex((reg),(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_movb_reg_memindex(s4 reg, s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0x88;
-       i386_emit_memindex((reg),(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_mov_imm_membase(s4 imm, s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xc7;
-       i386_emit_membase((basereg),(disp),0);
-       i386_emit_imm32((imm));
-}
-
-
-void i386_movsbl_memindex_reg(s4 disp, s4 basereg, s4 indexreg, s4 scale, s4 reg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xbe;
-       i386_emit_memindex((reg),(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_movswl_memindex_reg(s4 disp, s4 basereg, s4 indexreg, s4 scale, s4 reg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xbf;
-       i386_emit_memindex((reg),(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_movzwl_memindex_reg(s4 disp, s4 basereg, s4 indexreg, s4 scale, s4 reg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xb7;
-       i386_emit_memindex((reg),(disp),(basereg),(indexreg),(scale));
-}
-
-
-
-/*
- * alu operations
- */
-void i386_alu_reg_reg(s4 opc, s4 reg, s4 dreg) {
-       *(mcodeptr++) = (((u1) (opc)) << 3) + 1;
-       i386_emit_reg((reg),(dreg));
-}
-
-
-void i386_alu_reg_membase(s4 opc, s4 reg, s4 basereg, s4 disp) {
-       *(mcodeptr++) = (((u1) (opc)) << 3) + 1;
-       i386_emit_membase((basereg),(disp),(reg));
-}
-
-
-void i386_alu_membase_reg(s4 opc, s4 basereg, s4 disp, s4 reg) {
-       *(mcodeptr++) = (((u1) (opc)) << 3) + 3;
-       i386_emit_membase((basereg),(disp),(reg));
-}
-
-
-void i386_alu_imm_reg(s4 opc, s4 imm, s4 dreg) {
-       if (i386_is_imm8(imm)) { 
-               *(mcodeptr++) = (u1) 0x83;
-               i386_emit_reg((opc),(dreg));
-               i386_emit_imm8((imm));
-       } else { 
-               *(mcodeptr++) = (u1) 0x81;
-               i386_emit_reg((opc),(dreg));
-               i386_emit_imm32((imm));
-       } 
-}
-
-
-void i386_alu_imm_membase(s4 opc, s4 imm, s4 basereg, s4 disp) {
-       if (i386_is_imm8(imm)) { 
-               *(mcodeptr++) = (u1) 0x83;
-               i386_emit_membase((basereg),(disp),(opc));
-               i386_emit_imm8((imm));
-       } else { 
-               *(mcodeptr++) = (u1) 0x81;
-               i386_emit_membase((basereg),(disp),(opc));
-               i386_emit_imm32((imm));
-       } 
-}
-
-
-void i386_test_reg_reg(s4 reg, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x85;
-       i386_emit_reg((reg),(dreg));
-}
-
-
-void i386_test_imm_reg(s4 imm, s4 reg) {
-       *(mcodeptr++) = (u1) 0xf7;
-       i386_emit_reg(0,(reg));
-       i386_emit_imm32((imm));
-}
-
-
-
-/*
- * inc, dec operations
- */
-void i386_inc_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0x40 + ((reg) & 0x07);
-}
-
-
-void i386_inc_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xff;
-       i386_emit_membase((basereg),(disp),0);
-}
-
-
-void i386_dec_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0x48 + ((reg) & 0x07);
-}
-
-                
-void i386_dec_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xff;
-       i386_emit_membase((basereg),(disp),1);
-}
-
-
-void i386_dec_mem(s4 mem) {
-       *(mcodeptr++) = (u1) 0xff;
-       i386_emit_mem(1,(mem));
-}
-
-
-
-void i386_cltd() {
-       *(mcodeptr++) = (u1) 0x99;
-}
-
-
-
-void i386_imul_reg_reg(s4 reg, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xaf;
-       i386_emit_reg((dreg),(reg));
-}
-
-
-void i386_imul_membase_reg(s4 basereg, s4 disp, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xaf;
-       i386_emit_membase((basereg),(disp),(dreg));
-}
-
-
-void i386_imul_imm_reg(s4 imm, s4 dreg) {
-       if (i386_is_imm8((imm))) { 
-               *(mcodeptr++) = (u1) 0x6b;
-               i386_emit_reg(0,(dreg));
-               i386_emit_imm8((imm));
-       } else { 
-               *(mcodeptr++) = (u1) 0x69;
-               i386_emit_reg(0,(dreg));
-               i386_emit_imm32((imm));
-       } 
-}
-
-
-void i386_imul_imm_reg_reg(s4 imm, s4 reg, s4 dreg) {
-       if (i386_is_imm8((imm))) { 
-               *(mcodeptr++) = (u1) 0x6b;
-               i386_emit_reg((dreg),(reg));
-               i386_emit_imm8((imm));
-       } else { 
-               *(mcodeptr++) = (u1) 0x69;
-               i386_emit_reg((dreg),(reg));
-               i386_emit_imm32((imm));
-       } 
-}
-
-
-void i386_imul_imm_membase_reg(s4 imm, s4 basereg, s4 disp, s4 dreg) {
-       if (i386_is_imm8((imm))) { 
-               *(mcodeptr++) = (u1) 0x6b;
-               i386_emit_membase((basereg),(disp),(dreg));
-               i386_emit_imm8((imm));
-       } else { 
-               *(mcodeptr++) = (u1) 0x69;
-               i386_emit_membase((basereg),(disp),(dreg));
-               i386_emit_imm32((imm));
-       } 
-}
-
-
-void i386_mul_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xf7;
-       i386_emit_membase((basereg),(disp),4);
-}
-
-
-void i386_idiv_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xf7;
-       i386_emit_reg(7,(reg));
-}
-
-
-
-void i386_ret() {
-       *(mcodeptr++) = (u1) 0xc3;
-}
-
-
-
-/*
- * shift ops
- */
-void i386_shift_reg(s4 opc, s4 reg) {
-       *(mcodeptr++) = (u1) 0xd3;
-       i386_emit_reg((opc),(reg));
-}
-
-
-void i386_shift_membase(s4 opc, s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd3;
-       i386_emit_membase((basereg),(disp),(opc));
-}
-
-
-void i386_shift_imm_reg(s4 opc, s4 imm, s4 dreg) {
-       if ((imm) == 1) { 
-               *(mcodeptr++) = (u1) 0xd1;
-               i386_emit_reg((opc),(dreg));
-       } else { 
-               *(mcodeptr++) = (u1) 0xc1;
-               i386_emit_reg((opc),(dreg));
-               i386_emit_imm8((imm));
-       } 
-}
-
-
-void i386_shift_imm_membase(s4 opc, s4 imm, s4 basereg, s4 disp) {
-       if ((imm) == 1) { 
-               *(mcodeptr++) = (u1) 0xd1;
-               i386_emit_membase((basereg),(disp),(opc));
-       } else { 
-               *(mcodeptr++) = (u1) 0xc1;
-               i386_emit_membase((basereg),(disp),(opc));
-               i386_emit_imm8((imm));
-       } 
-}
-
-
-void i386_shld_reg_reg(s4 reg, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xa5;
-       i386_emit_reg((reg),(dreg));
-}
-
-
-void i386_shld_imm_reg_reg(s4 imm, s4 reg, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xa4;
-       i386_emit_reg((reg),(dreg));
-       i386_emit_imm8((imm));
-}
-
-
-void i386_shld_reg_membase(s4 reg, s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xa5;
-       i386_emit_membase((basereg),(disp),(reg));
-}
-
-
-void i386_shrd_reg_reg(s4 reg, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xad;
-       i386_emit_reg((reg),(dreg));
-}
-
-
-void i386_shrd_imm_reg_reg(s4 imm, s4 reg, s4 dreg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xac;
-       i386_emit_reg((reg),(dreg));
-       i386_emit_imm8((imm));
-}
-
-
-void i386_shrd_reg_membase(s4 reg, s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xad;
-       i386_emit_membase((basereg),(disp),(reg));
-}
-
-
-
-/*
- * jump operations
- */
-void i386_jmp_imm(s4 imm) {
-       *(mcodeptr++) = (u1) 0xe9;
-       i386_emit_imm32((imm));
-}
-
-
-void i386_jmp_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xff;
-       i386_emit_reg(4,(reg));
-}
-
-
-void i386_jcc(s4 opc, s4 imm) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) (0x80 + (opc));
-       i386_emit_imm32((imm));
-}
-
-
-
-/*
- * conditional set operations
- */
-void i386_setcc_reg(s4 opc, s4 reg) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) (0x90 + (opc));
-       i386_emit_reg(0,(reg));
-}
-
-
-void i386_setcc_membase(s4 opc, s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) (0x90 + (opc));
-       i386_emit_membase((basereg),(disp),0);
-}
-
-
-void i386_xadd_reg_mem(s4 reg, s4 mem) {
-       *(mcodeptr++) = (u1) 0x0f;
-       *(mcodeptr++) = (u1) 0xc1;
-       i386_emit_mem((reg),(mem));
-}
-
-
-void i386_neg_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xf7;
-       i386_emit_reg(3,(reg));
-}
-
-
-void i386_neg_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xf7;
-       i386_emit_membase((basereg),(disp),3);
-}
-
-
-
-void i386_push_imm(s4 imm) {
-       *(mcodeptr++) = (u1) 0x68;
-       i386_emit_imm32((imm));
-}
-
-
-void i386_pop_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0x58 + (0x07 & (reg));
-}
-
-
-void i386_push_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0x50 + (0x07 & (reg));
-}
-
-
-void i386_nop() {
-       *(mcodeptr++) = (u1) 0x90;
-}
-
-
-void i386_lock() {
-       *(mcodeptr++) = (u1) 0xf0;
-}
-
-
-/*
- * call instructions
- */
-void i386_call_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xff;
-       i386_emit_reg(2,(reg));
-}
-
-
-void i386_call_imm(s4 imm) {
-       *(mcodeptr++) = (u1) 0xe8;
-       i386_emit_imm32((imm));
-}
-
-
-void i386_call_mem(s4 mem) {
-       *(mcodeptr++) = (u1) 0xff;
-       i386_emit_mem(2, (mem));
-}
-
-
-
-/*
- * floating point instructions
- */
-void i386_fld1() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xe8;
-}
-
-
-void i386_fldz() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xee;
-}
-
-
-void i386_fld_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xc0 + (0x07 & (reg));
-}
-
-
-void i386_flds_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_membase((basereg),(disp),0);
-}
-
-
-void i386_fldl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdd;
-       i386_emit_membase((basereg),(disp),0);
-}
-
-
-void i386_fldt_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdb;
-       i386_emit_membase((basereg),(disp),5);
-}
-
-
-void i386_flds_memindex(s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_memindex(0,(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_fldl_memindex(s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0xdd;
-       i386_emit_memindex(0,(disp),(basereg),(indexreg),(scale));
-}
-
-
-
-
-void i386_fildl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdb;
-       i386_emit_membase((basereg),(disp),0);
-}
-
-
-void i386_fildll_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdf;
-       i386_emit_membase((basereg),(disp),5);
-}
-
-
-
-
-void i386_fst_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdd;
-       *(mcodeptr++) = (u1) 0xd0 + (0x07 & (reg));
-}
-
-
-void i386_fsts_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_membase((basereg),(disp),2);
-}
-
-
-void i386_fstl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdd;
-       i386_emit_membase((basereg),(disp),2);
-}
-
-
-void i386_fsts_memindex(s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_memindex(2,(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_fstl_memindex(s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0xdd;
-       i386_emit_memindex(2,(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_fstp_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdd;
-       *(mcodeptr++) = (u1) 0xd8 + (0x07 & (reg));
-}
-
-
-void i386_fstps_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_membase((basereg),(disp),3);
-}
-
-
-void i386_fstpl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdd;
-       i386_emit_membase((basereg),(disp),3);
-}
-
-
-void i386_fstpt_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdb;
-       i386_emit_membase((basereg),(disp),7);
-}
-
-
-void i386_fstps_memindex(s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_memindex(3,(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_fstpl_memindex(s4 disp, s4 basereg, s4 indexreg, s4 scale) {
-       *(mcodeptr++) = (u1) 0xdd;
-       i386_emit_memindex(3,(disp),(basereg),(indexreg),(scale));
-}
-
-
-void i386_fistl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdb;
-       i386_emit_membase((basereg),(disp),2);
-}
-
-
-void i386_fistpl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdb;
-       i386_emit_membase((basereg),(disp),3);
-}
-
-
-void i386_fistpll_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdf;
-       i386_emit_membase((basereg),(disp),7);
-}
-
-
-void i386_fchs() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xe0;
-}
-
-
-void i386_faddp() {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xc1;
-}
-
-
-void i386_fadd_reg_st(s4 reg) {
-       *(mcodeptr++) = (u1) 0xd8;
-       *(mcodeptr++) = (u1) 0xc0 + (0x0f & (reg));
-}
-
-
-void i386_fadd_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdc;
-       *(mcodeptr++) = (u1) 0xc0 + (0x0f & (reg));
-}
-
-
-void i386_faddp_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xc0 + (0x0f & (reg));
-}
-
-
-void i386_fadds_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd8;
-       i386_emit_membase((basereg),(disp),0);
-}
-
-
-void i386_faddl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdc;
-       i386_emit_membase((basereg),(disp),0);
-}
-
-
-void i386_fsub_reg_st(s4 reg) {
-       *(mcodeptr++) = (u1) 0xd8;
-       *(mcodeptr++) = (u1) 0xe0 + (0x07 & (reg));
-}
-
-
-void i386_fsub_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdc;
-       *(mcodeptr++) = (u1) 0xe8 + (0x07 & (reg));
-}
-
-
-void i386_fsubp_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xe8 + (0x07 & (reg));
-}
-
-
-void i386_fsubp() {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xe9;
-}
-
-
-void i386_fsubs_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd8;
-       i386_emit_membase((basereg),(disp),4);
-}
-
-
-void i386_fsubl_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdc;
-       i386_emit_membase((basereg),(disp),4);
-}
-
-
-void i386_fmul_reg_st(s4 reg) {
-       *(mcodeptr++) = (u1) 0xd8;
-       *(mcodeptr++) = (u1) 0xc8 + (0x07 & (reg));
-}
-
-
-void i386_fmul_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdc;
-       *(mcodeptr++) = (u1) 0xc8 + (0x07 & (reg));
-}
-
-
-void i386_fmulp() {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xc9;
-}
-
-
-void i386_fmulp_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xc8 + (0x07 & (reg));
-}
-
-
-void i386_fmuls_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd8;
-       i386_emit_membase((basereg),(disp),1);
-}
-
-
-void i386_fmull_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xdc;
-       i386_emit_membase((basereg),(disp),1);
-}
-
-
-void i386_fdiv_reg_st(s4 reg) {
-       *(mcodeptr++) = (u1) 0xd8;
-       *(mcodeptr++) = (u1) 0xf0 + (0x07 & (reg));
-}
-
-
-void i386_fdiv_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdc;
-       *(mcodeptr++) = (u1) 0xf8 + (0x07 & (reg));
-}
-
-
-void i386_fdivp() {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xf9;
-}
-
-
-void i386_fdivp_st_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xde;
-       *(mcodeptr++) = (u1) 0xf8 + (0x07 & (reg));
-}
+    if (runverbose) {
+               /* restore return value */
 
+               if (IS_INT_LNG_TYPE(md->returntype.type)) {
+                       if (IS_2_WORD_TYPE(md->returntype.type))
+                               M_ILD(REG_RESULT2, REG_SP, 2 * 4);
+                       M_ILD(REG_RESULT, REG_SP, 1 * 4);
+       
+               } else {
+                       if (IS_2_WORD_TYPE(md->returntype.type))
+                               i386_fldl_membase(cd, REG_SP, 1 * 4);
+                       else
+                               i386_flds_membase(cd, REG_SP, 1 * 4);
+               }
 
-void i386_fxch() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xc9;
-}
+               M_ASUB_IMM(4 + 8 + 8 + 4, REG_SP);
 
+               M_AST_IMM((ptrint) m, REG_SP, 0);
 
-void i386_fxch_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xc8 + (0x07 & (reg));
-}
+               M_IST(REG_RESULT, REG_SP, 4);
+               M_IST(REG_RESULT2, REG_SP, 4 + 4);
 
+               i386_fstl_membase(cd, REG_SP, 4 + 8);
+               i386_fsts_membase(cd, REG_SP, 4 + 8 + 8);
 
-void i386_fprem() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xf8;
-}
+               M_MOV_IMM((ptrint) builtin_displaymethodstop, REG_ITMP1);
+               M_CALL(REG_ITMP1);
 
+               M_AADD_IMM(4 + 8 + 8 + 4, REG_SP);
+    }
 
-void i386_fprem1() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xf5;
-}
+       /* check for exception */
 
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+/*     i386_call_mem(cd, (ptrint) builtin_get_exceptionptrptr); */
+       i386_call_mem(cd, (ptrint) &callgetexceptionptrptr);
+#else
+       M_MOV_IMM((ptrint) &_exceptionptr, REG_RESULT);
+#endif
+       /* we can't use REG_ITMP3 == REG_RESULT2 */
+       M_ALD(REG_ITMP2, REG_RESULT, 0);
 
-void i386_fucom() {
-       *(mcodeptr++) = (u1) 0xdd;
-       *(mcodeptr++) = (u1) 0xe1;
-}
+       /* restore return value */
 
+       if (IS_INT_LNG_TYPE(md->returntype.type)) {
+               if (IS_2_WORD_TYPE(md->returntype.type))
+                       M_ILD(REG_RESULT2, REG_SP, 2 * 4);
+               M_ILD(REG_RESULT, REG_SP, 1 * 4);
+       
+       } else {
+               if (IS_2_WORD_TYPE(md->returntype.type))
+                       i386_fldl_membase(cd, REG_SP, 1 * 4);
+               else
+                       i386_flds_membase(cd, REG_SP, 1 * 4);
+       }
 
-void i386_fucom_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdd;
-       *(mcodeptr++) = (u1) 0xe0 + (0x07 & (reg));
-}
+       M_AADD_IMM(stackframesize * 4, REG_SP);
 
+       M_TEST(REG_ITMP2);
+       M_BNE(1);
 
-void i386_fucomp_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdd;
-       *(mcodeptr++) = (u1) 0xe8 + (0x07 & (reg));
-}
+       M_RET;
 
+       /* handle exception */
 
-void i386_fucompp() {
-       *(mcodeptr++) = (u1) 0xda;
-       *(mcodeptr++) = (u1) 0xe9;
-}
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       i386_push_reg(cd, REG_ITMP2);
+/*     i386_call_mem(cd, (ptrint) builtin_get_exceptionptrptr); */
+       i386_call_mem(cd, (ptrint) &callgetexceptionptrptr);
+       i386_mov_imm_membase(cd, 0, REG_RESULT, 0);
+       i386_pop_reg(cd, REG_ITMP1_XPTR);
+#else
+       M_MOV(REG_ITMP2, REG_ITMP1_XPTR);
+       M_MOV_IMM((ptrint) &_exceptionptr, REG_ITMP2);
+       i386_mov_imm_membase(cd, 0, REG_ITMP2, 0);
+#endif
+       M_ALD(REG_ITMP2_XPC, REG_SP, 0);
+       M_ASUB_IMM(2, REG_ITMP2_XPC);
 
+       M_MOV_IMM((ptrint) asm_handle_nat_exception, REG_ITMP3);
+       M_JMP(REG_ITMP3);
 
-void i386_fnstsw() {
-       *(mcodeptr++) = (u1) 0xdf;
-       *(mcodeptr++) = (u1) 0xe0;
-}
 
+       /* process patcher calls **************************************************/
 
-void i386_sahf() {
-       *(mcodeptr++) = (u1) 0x9e;
-}
+       {
+               u1          *xcodeptr;
+               patchref    *pref;
+               codegendata *tmpcd;
+               u8           mcode;
 
+               tmpcd = DNEW(codegendata);
 
-void i386_finit() {
-       *(mcodeptr++) = (u1) 0x9b;
-       *(mcodeptr++) = (u1) 0xdb;
-       *(mcodeptr++) = (u1) 0xe3;
-}
+               for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
+                       /* Get machine code which is patched back in later. A             */
+                       /* `call rel32' is 5 bytes long.                                  */
 
+                       xcodeptr = cd->mcodebase + pref->branchpos;
+                       mcode =  *((u8 *) xcodeptr);
 
-void i386_fldcw_mem(s4 mem) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_mem(5,(mem));
-}
+                       /* patch in `call rel32' to call the following code               */
 
+                       tmpcd->mcodeptr = xcodeptr;     /* set dummy mcode pointer        */
+                       i386_call_imm(tmpcd, cd->mcodeptr - (xcodeptr + 5));
 
-void i386_fldcw_membase(s4 basereg, s4 disp) {
-       *(mcodeptr++) = (u1) 0xd9;
-       i386_emit_membase((basereg),(disp),5);
-}
+                       /* move pointer to java_objectheader onto stack */
 
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+                       /* create a virtual java_objectheader */
 
-void i386_wait() {
-       *(mcodeptr++) = (u1) 0x9b;
-}
+                       (void) dseg_addaddress(cd, get_dummyLR());          /* monitorPtr */
+                       disp = dseg_addaddress(cd, NULL);                   /* vftbl      */
 
+                       M_MOV_IMM(0, REG_ITMP3);
+                       dseg_adddata(cd, cd->mcodeptr);
+                       M_AADD_IMM(disp, REG_ITMP3);
+                       M_PUSH(REG_ITMP3);
+#else
+                       M_PUSH_IMM(0);
+#endif
 
-void i386_ffree_reg(s4 reg) {
-       *(mcodeptr++) = (u1) 0xdd;
-       *(mcodeptr++) = (u1) 0xc0 + (0x07 & (reg));
-}
+                       /* move machine code bytes and classinfo pointer onto stack */
 
+                       M_PUSH_IMM((ptrint) (mcode >> 32));
+                       M_PUSH_IMM((ptrint) mcode);
+                       M_PUSH_IMM((ptrint) pref->ref);
+                       M_PUSH_IMM((ptrint) pref->patcher);
 
-void i386_fdecstp() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xf6;
-}
+                       M_MOV_IMM((ptrint) asm_wrapper_patcher, REG_ITMP3);
+                       M_JMP(REG_ITMP3);
+               }
+       }
 
+       codegen_finish(m, cd, (s4) ((u1 *) cd->mcodeptr - cd->mcodebase));
 
-void i386_fincstp() {
-       *(mcodeptr++) = (u1) 0xd9;
-       *(mcodeptr++) = (u1) 0xf7;
+       return m->entrypoint;
 }