Merged changes from trunk.
[cacao.git] / src / vm / jit / powerpc / codegen.c
index 348456579ea9f9b62eb418a243eab046f86b24c6..38118d9b80012b69f1919736919ce3984298f9b9 100644 (file)
@@ -1,9 +1,9 @@
-/* vm/jit/powerpc/codegen.c - machine code generator for 32-bit powerpc
+/* src/vm/jit/powerpc/codegen.c - machine code generator for 32-bit PowerPC
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 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
             Stefan Ring
 
    Changes: Christian Thalinger
+            Christian Ullrich
+            Edwin Steiner
 
-   $Id: codegen.c 2015 2005-03-08 06:34:11Z christian $
+   $Id: codegen.c 5323 2006-09-05 16:45:24Z edwin $
 
 */
 
 
+#include "config.h"
+
+#include <assert.h>
 #include <stdio.h>
 #include <signal.h>
 
-#include "config.h"
-#include "cacao/cacao.h"
+#include "vm/types.h"
+
+#include "md-abi.h"
+
+#include "vm/jit/powerpc/arch.h"
+#include "vm/jit/powerpc/codegen.h"
+
+#include "mm/memory.h"
 #include "native/native.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/lock.h"
+#endif
+
 #include "vm/builtin.h"
+#include "vm/exceptions.h"
 #include "vm/global.h"
 #include "vm/loader.h"
-#include "vm/tables.h"
+#include "vm/options.h"
+#include "vm/stringlocal.h"
+#include "vm/vm.h"
+#include "vm/jit/abi-asm.h"
 #include "vm/jit/asmpart.h"
+#include "vm/jit/codegen-common.h"
+#include "vm/jit/dseg.h"
+#include "vm/jit/emit.h"
 #include "vm/jit/jit.h"
+#include "vm/jit/methodheader.h"
 #include "vm/jit/parse.h"
+#include "vm/jit/patcher.h"
 #include "vm/jit/reg.h"
-#include "vm/jit/powerpc/arch.h"
-#include "vm/jit/powerpc/codegen.h"
-#include "vm/jit/powerpc/types.h"
-
-
-/* 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 */
-static int nregdescint[] = {
-       REG_RES, REG_RES, REG_TMP, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, 
-       REG_ARG, REG_ARG, REG_ARG, REG_RES, REG_RES, REG_RES, REG_SAV, REG_SAV, 
-       REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
-       REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV,
-       REG_END };
-
-/* for use of reserved registers, see comment above */
-       
-static int nregdescfloat[] = {
-       REG_RES, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
-       REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_SAV, REG_SAV, 
-       REG_RES, REG_RES, REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
-       REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV,
-       REG_END };
-
-
-/* Include independent code generation stuff -- include after register        */
-/* descriptions to avoid extern definitions.                                  */
-
-#include "vm/jit/codegen.inc"
-#include "vm/jit/reg.inc"
-#ifdef LSRA
-#include "vm/jit/lsra.inc"
-#endif
-
-
-void asm_cacheflush(void *, long);
-
-/* #include <architecture/ppc/cframe.h> */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-void thread_restartcriticalsection(void *u)
-{
-       /* XXX set pc to restart address */
-}
-#endif
-
-#if defined(__DARWIN__)
-#include <mach/message.h>
+#include "vm/jit/replace.h"
 
-int cacao_catch_Handler(mach_port_t thread)
-{
-#if defined(USE_THREADS)
-       unsigned int *regs;
-       unsigned int crashpc;
-       s4 instr, reg;
-       java_objectheader *xptr;
-
-       /* Mach stuff */
-       thread_state_flavor_t flavor = PPC_THREAD_STATE;
-       mach_msg_type_number_t thread_state_count = PPC_THREAD_STATE_COUNT;
-       ppc_thread_state_t thread_state;
-       kern_return_t r;
-       
-       if (checknull)
-               return 0;
-
-       r = thread_get_state(thread, flavor,
-               (natural_t*)&thread_state, &thread_state_count);
-       if (r != KERN_SUCCESS)
-               panic("thread_get_state failed");
-
-       regs = &thread_state.r0;
-       crashpc = thread_state.srr0;
-
-       instr = *(s4*) crashpc;
-       reg = (instr >> 16) & 31;
-
-       if (!regs[reg]) {
-/*      This is now handled in asmpart because it needs to run in the throwing
- *      thread */
-/*             xptr = new_nullpointerexception(); */
-
-               regs[REG_ITMP2_XPC] = crashpc;
-/*             regs[REG_ITMP1_XPTR] = (u4) xptr; */
-               thread_state.srr0 = (u4) asm_handle_nullptr_exception;
-
-               r = thread_set_state(thread, flavor,
-                       (natural_t*)&thread_state, thread_state_count);
-               if (r != KERN_SUCCESS)
-                       panic("thread_set_state failed");
-
-               return 1;
-       }
-
-       throw_cacao_exception_exit(string_java_lang_InternalError, "Segmentation fault at %p", regs[reg]);
-#endif
-
-       return 0;
-}
-#endif /* __DARWIN__ */
-
-
-void init_exceptions(void)
-{
-       GC_dirty_init(1);
-
-#if !defined(__DARWIN__)
-       nregdescint[2] = REG_RES;
+#if defined(ENABLE_LSRA)
+# include "vm/jit/allocator/lsra.h"
 #endif
-}
-
-void adjust_argvars(stackptr s, int d, int *fa, int *ia)
-{
-       if (!d) {
-               *fa = 0; *ia = 0;
-               return;
-       }
-       adjust_argvars(s->prev, d-1, fa, ia);
-       if (s->varkind == ARGVAR)
-               s->varnum = (IS_FLT_DBL_TYPE(s->type)) ? *fa : *ia;
-       *fa += (IS_FLT_DBL_TYPE(s->type) != 0);
-       *ia += (IS_2_WORD_TYPE(s->type)) ? 2 : 1;
-}
-
-
-#define intmaxf(a,b) (((a)<(b)) ? (b) : (a))
-
-void preregpass(methodinfo *m, registerdata *rd)
-{
-       int paramsize;
-       stackptr    src;
-       basicblock  *bptr;
-       instruction *iptr;
-       int s3, len;
-
-       rd->ifmemuse = 0;
-
-       for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
-               len = bptr->icount;
-               for (iptr = bptr->iinstr, src = bptr->instack;
-                   len > 0;
-                   src = iptr->dst, len--, iptr++)
-               {
-                       if (bptr->flags < BBREACHED)
-                               continue;
-                       switch (iptr->opc) {
-                               case ICMD_BUILTIN1:
-                                       s3 = 1;
-                                       goto countparams;
-                               case ICMD_BUILTIN2:
-                                       s3 = 2;
-                                       goto countparams;
-                               case ICMD_BUILTIN3:
-                                       s3 = 3;
-                                       goto countparams;
-
-                               case ICMD_INVOKEVIRTUAL:
-                               case ICMD_INVOKESPECIAL:
-                               case ICMD_INVOKESTATIC:
-                               case ICMD_INVOKEINTERFACE:
-                                       s3 = iptr->op1;
-countparams:
-                                       {
-                                               int ia, fa;
-                                               adjust_argvars(src, s3, &fa, &ia);
-                                       }
-                                       paramsize = 0;
-                                       for (; --s3 >= 0; src = src->prev) {
-                                               paramsize += IS_2_WORD_TYPE(src->type) ? 2 : 1;
-                                       }
-                                       rd->ifmemuse = intmaxf(rd->ifmemuse, paramsize);
-                                       break;
-
-                               case ICMD_MULTIANEWARRAY:
-                                       s3 = iptr->op1;
-                                       paramsize = rd->intreg_argnum + s3;
-                                       rd->ifmemuse = intmaxf(rd->ifmemuse, paramsize);
-                                       break;
-                       }
-               }
-       }
-
-       rd->ifmemuse += 6;
-       rd->maxmemuse = rd->ifmemuse;
-}
 
 
-/* function gen_mcode **********************************************************
+/* codegen *********************************************************************
 
-       generates machine code
+   Generates machine code.
 
 *******************************************************************************/
 
-void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
+bool codegen(jitdata *jd)
 {
-       s4 len, s1, s2, s3, d;
-       s4 a;
-       s4 parentargs_base;
-       s4          *mcodeptr;
-       stackptr    src;
-       varinfo     *var;
-       basicblock  *bptr;
-       instruction *iptr;
-       exceptiontable *ex;
+       methodinfo         *m;
+       codeinfo           *code;
+       codegendata        *cd;
+       registerdata       *rd;
+       s4                  len, s1, s2, s3, d, disp;
+       ptrint              a;
+       stackptr            src;
+       varinfo            *var;
+       basicblock         *bptr;
+       instruction        *iptr;
+       exceptiontable     *ex;
+       u2                  currentline;
+       methodinfo         *lm;             /* local methodinfo for ICMD_INVOKE*  */
+       builtintable_entry *bte;
+       methoddesc         *md;
+       rplpoint           *replacementpoint;
+
+       /* get required compiler data */
+
+       m    = jd->m;
+       code = jd->code;
+       cd   = jd->cd;
+       rd   = jd->rd;
+
+       /* prevent compiler warnings */
+
+       d = 0;
+       lm = NULL;
+       bte = NULL;
 
        {
-       s4 i, p, pa, t, l;
+       s4 i, p, t, l;
        s4 savedregs_num;
 
        savedregs_num = 0;
 
        /* space to save used callee saved registers */
 
-       savedregs_num += (rd->savintregcnt - rd->maxsavintreguse);
-       savedregs_num += 2 * (rd->savfltregcnt - rd->maxsavfltreguse);
+       savedregs_num += (INT_SAV_CNT - rd->savintreguse);
+       savedregs_num += (FLT_SAV_CNT - rd->savfltreguse) * 2;
 
-       parentargs_base = rd->maxmemuse + savedregs_num;
+       cd->stackframesize = rd->memuse + savedregs_num;
 
-#ifdef USE_THREADS                 /* space to save argument of monitor_enter */
+#if defined(ENABLE_THREADS)
+       /* Space to save argument of monitor_enter and Return Values to
+          survive monitor_exit. The stack position for the argument can
+          not be shared with place to save the return register on PPC,
+          since both values reside in R3. */
 
-       if (checksync && (m->flags & ACC_SYNCHRONIZED))
-               parentargs_base++;
+       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+               /* reserve 2 slots for long/double return values for monitorexit */
+
+               if (IS_2_WORD_TYPE(m->parseddesc->returntype.type))
+                       cd->stackframesize += 3;
+               else
+                       cd->stackframesize += 2;
+       }
 
 #endif
 
        /* create method header */
 
-       parentargs_base = (parentargs_base + 3) & ~3;
+       /* align stack to 16-bytes */
 
-#if POINTERSIZE == 4
-       (void) dseg_addaddress(cd, m);                          /* Filler         */
-#endif
-       (void) dseg_addaddress(cd, m);                          /* MethodPointer  */
-       (void) dseg_adds4(cd, parentargs_base * 4);             /* FrameSize      */
+       if (!jd->isleafmethod || JITDATA_HAS_FLAG_VERBOSECALL(jd))
+               cd->stackframesize = (cd->stackframesize + 3) & ~3;
+
+       else if (jd->isleafmethod && (cd->stackframesize == LA_SIZE_IN_POINTERS))
+               cd->stackframesize = 0;
 
-#ifdef USE_THREADS
+       (void) dseg_add_unique_address(cd, code);              /* CodeinfoPointer */
+       (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize       */
 
+#if defined(ENABLE_THREADS)
        /* IsSync contains the offset relative to the stack pointer for the
           argument of monitor_exit used in the exception handler. Since the
           offset could be zero and give a wrong meaning of the flag it is
@@ -300,291 +169,230 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
        */
 
        if (checksync && (m->flags & ACC_SYNCHRONIZED))
-               (void) dseg_adds4(cd, (rd->maxmemuse + 1) * 4);     /* IsSync         */
+               (void) dseg_add_unique_s4(cd, (rd->memuse + 1) * 4);/* IsSync         */
        else
-
 #endif
-
-               (void) dseg_adds4(cd, 0);                           /* IsSync         */
+               (void) dseg_add_unique_s4(cd, 0);                  /* IsSync          */
                                               
-       (void) dseg_adds4(cd, m->isleafmethod);                 /* IsLeaf         */
-       (void) dseg_adds4(cd, rd->savintregcnt - rd->maxsavintreguse); /* IntSave */
-       (void) dseg_adds4(cd, rd->savfltregcnt - rd->maxsavfltreguse); /* FltSave */
-       (void) dseg_adds4(cd, cd->exceptiontablelength);        /* ExTableSize    */
+       (void) dseg_add_unique_s4(cd, jd->isleafmethod);       /* IsLeaf          */
+       (void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
+       (void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
+
+       dseg_addlinenumbertablesize(cd);
+
+       (void) dseg_add_unique_s4(cd, cd->exceptiontablelength); /* ExTableSize   */
 
        /* create exception table */
 
        for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
-               dseg_addtarget(cd, ex->start);
-               dseg_addtarget(cd, ex->end);
-               dseg_addtarget(cd, ex->handler);
-               (void) dseg_addaddress(cd, ex->catchtype);
+               dseg_add_target(cd, ex->start);
+               dseg_add_target(cd, ex->end);
+               dseg_add_target(cd, ex->handler);
+               (void) dseg_add_unique_address(cd, ex->catchtype.cls);
        }
        
-       /* initialize mcode variables */
-       
-       mcodeptr = (s4 *) cd->mcodebase;
-       cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
-       MCODECHECK(128 + m->paramcount);
+       /* generate method profiling code */
 
-       /* create stack frame (if necessary) */
+       if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
+               /* count frequency */
 
-       if (!m->isleafmethod) {
-               M_MFLR(REG_ITMP3);
-               M_AST(REG_ITMP3, REG_SP, 8);
-       }
+               M_ALD(REG_ITMP1, REG_PV, CodeinfoPointer);
+               M_ALD(REG_ITMP2, REG_ITMP1, OFFSET(codeinfo, frequency));
+               M_IADD_IMM(REG_ITMP2, 1, REG_ITMP2);
+               M_AST(REG_ITMP2, REG_ITMP1, OFFSET(codeinfo, frequency));
 
-       if (parentargs_base) {
-               M_STWU(REG_SP, REG_SP, -parentargs_base * 4);
+/*             PROFILE_CYCLE_START; */
        }
 
-       /* save return address and used callee saved registers */
+       /* create stack frame (if necessary) */
 
-       p = parentargs_base;
-       for (i = rd->savintregcnt - 1; i >= rd->maxsavintreguse; i--) {
-               p--; M_IST(rd->savintregs[i], REG_SP, 4 * p);
-       }
-       for (i = rd->savfltregcnt - 1; i >= rd->maxsavfltreguse; i--) {
-               p-=2; M_DST(rd->savfltregs[i], REG_SP, 4 * p);
+       if (!jd->isleafmethod) {
+               M_MFLR(REG_ZERO);
+               M_AST(REG_ZERO, REG_SP, LA_LR_OFFSET);
        }
 
-       /* save monitorenter argument */
-
-#if defined(USE_THREADS)
-       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
-               if (m->flags & ACC_STATIC) {
-                       p = dseg_addaddress(cd, m->class);
-                       M_ALD(REG_ITMP1, REG_PV, p);
-                       M_AST(REG_ITMP1, REG_SP, 4 * rd->maxmemuse);
-
-               } else {
-                       M_AST(rd->argintregs[0], REG_SP, 4 * rd->maxmemuse);
-               }
-       }                       
-#endif
-
-       /* copy argument registers to stack and call trace function with pointer
-          to arguments on stack.
-       */
-
-       if (runverbose) {
-               s4 longargs = 0;
-               s4 fltargs = 0;
-               s4 dblargs = 0;
-
-               M_MFLR(REG_ITMP3);
-               /* XXX must be a multiple of 16 */
-               M_LDA(REG_SP, REG_SP, -(24 + (INT_ARG_CNT + FLT_ARG_CNT + 1) * 8));
-
-               M_IST(REG_ITMP3, REG_SP, 24 + (INT_ARG_CNT + FLT_ARG_CNT) * 8);
-
-               M_CLR(REG_ITMP1);    /* clear help register */
-
-               /* save all arguments into the reserved stack space */
-               for (p = 0; p < m->paramcount && p < TRACE_ARGS_NUM; p++) {
-                       t = m->paramtypes[p];
-
-                       if (IS_INT_LNG_TYPE(t)) {
-                               /* overlapping u8's are on the stack */
-                               if ((p + longargs + dblargs) < (INT_ARG_CNT - IS_2_WORD_TYPE(t))) {
-                                       s1 = rd->argintregs[p + longargs + dblargs];
-
-                                       if (!IS_2_WORD_TYPE(t)) {
-                                               M_IST(REG_ITMP1, REG_SP, 24 + p * 8);
-                                               M_IST(s1, REG_SP, 24 + p * 8 + 4);
-
-                                       } else {
-                                               M_IST(s1, REG_SP, 24 + p  * 8);
-                                               M_IST(rd->secondregs[s1], REG_SP, 24 + p * 8 + 4);
-                                               longargs++;
-                                       }
-
-                               } else {
-                    a = dseg_adds4(cd, 0xdeadbeef);
-                    M_ILD(REG_ITMP1, REG_PV, a);
-                    M_IST(REG_ITMP1, REG_SP, 24 + p * 8);
-                    M_IST(REG_ITMP1, REG_SP, 24 + p * 8 + 4);
-                               }
-
-                       } else {
-                               if ((fltargs + dblargs) < FLT_ARG_CNT) {
-                                       s1 = rd->argfltregs[fltargs + dblargs];
-
-                                       if (!IS_2_WORD_TYPE(t)) {
-                                               M_IST(REG_ITMP1, REG_SP, 24 + p * 8);
-                                               M_FST(s1, REG_SP, 24 + p * 8 + 4);
-                                               fltargs++;
-                                               
-                                       } else {
-                                               M_DST(s1, REG_SP, 24 + p * 8);
-                                               dblargs++;
-                                       }
-
-                               } else {
-                                       /* this should not happen */
-                               }
-                       }
-               }
-
-               /* TODO: save remaining integer and flaot argument registers */
-
-               /* load first 4 arguments into integer argument registers */
-               for (p = 0; p < 8; p++) {
-                       d = rd->argintregs[p];
-                       M_ILD(d, REG_SP, 24 + p * 4);
-               }
-
-               p = dseg_addaddress(cd, m);
-               M_ALD(REG_ITMP1, REG_PV, p);
-               M_AST(REG_ITMP1, REG_SP, 11 * 8);    /* 24 (linkage area) + 32 (4 * s8 parameter area regs) + 32 (4 * s8 parameter area stack) = 88 */
-               p = dseg_addaddress(cd, (void *) builtin_trace_args);
-               M_ALD(REG_ITMP2, REG_PV, p);
-               M_MTCTR(REG_ITMP2);
-               M_JSR;
-
-               longargs = 0;
-               fltargs = 0;
-               dblargs = 0;
-
-        /* restore arguments into the reserved stack space */
-        for (p = 0; p < m->paramcount && p < TRACE_ARGS_NUM; p++) {
-            t = m->paramtypes[p];
-
-            if (IS_INT_LNG_TYPE(t)) {
-                if ((p + longargs + dblargs) < INT_ARG_CNT) {
-                    s1 = rd->argintregs[p + longargs + dblargs];
-
-                                       if (!IS_2_WORD_TYPE(t)) {
-                                               M_ILD(s1, REG_SP, 24 + p * 8 + 4);
-
-                                       } else {
-                                               M_ILD(s1, REG_SP, 24 + p  * 8);
-                                               M_ILD(rd->secondregs[s1], REG_SP, 24 + p * 8 + 4);
-                                               longargs++;
-                                       }
-                               }
-
-            } else {
-                if ((fltargs + dblargs) < FLT_ARG_CNT) {
-                    s1 = rd->argfltregs[fltargs + dblargs];
-
-                                       if (!IS_2_WORD_TYPE(t)) {
-                                               M_FLD(s1, REG_SP, 24 + p * 8 + 4);
-                                               fltargs++;
-
-                                       } else {
-                                               M_DLD(s1, REG_SP, 24 + p * 8);
-                                               dblargs++;
-                                       }
-                               }
-            }
-        }
+       if (cd->stackframesize)
+               M_STWU(REG_SP, REG_SP, -(cd->stackframesize * 4));
 
-               M_ILD(REG_ITMP3, REG_SP, 24 + (INT_ARG_CNT + FLT_ARG_CNT) * 8);
+       /* save return address and used callee saved registers */
 
-               M_LDA(REG_SP, REG_SP, 24 + (INT_ARG_CNT + FLT_ARG_CNT + 1) * 8);
-               M_MTLR(REG_ITMP3);
+       p = cd->stackframesize;
+       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+               p--; M_IST(rd->savintregs[i], REG_SP, p * 4);
+       }
+       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+               p -= 2; M_DST(rd->savfltregs[i], REG_SP, p * 4);
        }
 
        /* take arguments out of register or stack frame */
 
-       {
-               int narg=0, niarg=0;
-               int arg, iarg;
+       md = m->parseddesc;
 
-       for (p = 0, l = 0; p < m->paramcount; p++) {
-               arg = narg; iarg = niarg;
-               t = m->paramtypes[p];
+       for (p = 0, l = 0; p < md->paramcount; p++) {
+               t = md->paramtypes[p].type;
                var = &(rd->locals[l][t]);
-               l++, niarg++;
+               l++;
                if (IS_2_WORD_TYPE(t))    /* increment local counter for 2 word types */
-                       l++, niarg++;
+                       l++;
                if (var->type < 0)
                        continue;
+               s1 = md->params[p].regoff;
                if (IS_INT_LNG_TYPE(t)) {                    /* integer args          */
-                       if (iarg < INT_ARG_CNT -
-                                       (IS_2_WORD_TYPE(t)!=0)) {        /* register arguments    */
+                       if (IS_2_WORD_TYPE(t))
+                               s2 = PACK_REGS(rd->argintregs[GET_LOW_REG(s1)],
+                                                          rd->argintregs[GET_HIGH_REG(s1)]);
+                       else
+                               s2 = rd->argintregs[s1];
+                       if (!md->params[p].inmemory) {           /* register arguments    */
                                if (!(var->flags & INMEMORY)) {      /* reg arg -> register   */
-                                       M_TINTMOVE(t, rd->argintregs[iarg], var->regoff);
+                                       if (IS_2_WORD_TYPE(t))
+                                               M_LNGMOVE(s2, var->regoff);
+                                       else
+                                               M_INTMOVE(s2, var->regoff);
 
                                } else {                             /* reg arg -> spilled    */
-                                       M_IST(rd->argintregs[iarg], REG_SP, 4 * var->regoff);
                                        if (IS_2_WORD_TYPE(t))
-                                               M_IST(rd->secondregs[rd->argintregs[iarg]], REG_SP, 4 * var->regoff + 4);
+                                               M_LST(s2, REG_SP, var->regoff * 4);
+                                       else
+                                               M_IST(s2, REG_SP, var->regoff * 4);
                                }
 
                        } else {                                 /* stack arguments       */
-                               pa = iarg + 6;
-                               if (!(var->flags & INMEMORY)) {      /* stack arg -> register */ 
-                                       M_ILD(var->regoff, REG_SP, 4 * (parentargs_base + pa));
+                               if (!(var->flags & INMEMORY)) {      /* stack arg -> register */
                                        if (IS_2_WORD_TYPE(t))
-                                               M_ILD(rd->secondregs[var->regoff], REG_SP, 4 * (parentargs_base + pa) + 4);
+                                               M_LLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
+                                       else
+                                               M_ILD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
 
-                               } else {                              /* stack arg -> spilled  */
-                                       M_ILD(REG_ITMP1, REG_SP, 4 * (parentargs_base + pa));
-                                       M_IST(REG_ITMP1, REG_SP, 4 * var->regoff);
+                               } else {                             /* stack arg -> spilled  */
+#if 1
+                                       M_ILD(REG_ITMP1, REG_SP, (cd->stackframesize + s1) * 4);
+                                       M_IST(REG_ITMP1, REG_SP, var->regoff * 4);
                                        if (IS_2_WORD_TYPE(t)) {
-                                               M_ILD(REG_ITMP1, REG_SP, 4 * (parentargs_base + pa) + 4);
-                                               M_IST(REG_ITMP1, REG_SP, 4 * var->regoff + 4);
+                                               M_ILD(REG_ITMP1, REG_SP, (cd->stackframesize + s1) * 4 +4);
+                                               M_IST(REG_ITMP1, REG_SP, var->regoff * 4 + 4);
                                        }
+#else
+                                       /* Reuse Memory Position on Caller Stack */
+                                       var->regoff = cd->stackframesize + s1;
+#endif
                                }
                        }
 
-               } else {                                     /* floating args         */   
-                       ++narg;
-                       if (arg < FLT_ARG_CNT) {                 /* register arguments    */
+               } else {                                     /* floating args         */
+                       if (!md->params[p].inmemory) {           /* register arguments    */
+                               s2 = rd->argfltregs[s1];
                                if (!(var->flags & INMEMORY)) {      /* reg arg -> register   */
-                                       M_FLTMOVE(rd->argfltregs[arg], var->regoff);
+                                       M_FLTMOVE(s2, var->regoff);
 
                                } else {                                         /* reg arg -> spilled    */
-                                       M_DST(rd->argfltregs[arg], REG_SP, 4 * var->regoff);
+                                       if (IS_2_WORD_TYPE(t))
+                                               M_DST(s2, REG_SP, var->regoff * 4);
+                                       else
+                                               M_FST(s2, REG_SP, var->regoff * 4);
                                }
 
                        } else {                                 /* stack arguments       */
-                               pa = iarg + 6;
                                if (!(var->flags & INMEMORY)) {      /* stack-arg -> register */
-                                       if (IS_2_WORD_TYPE(t)) {
-                                               M_DLD(var->regoff, REG_SP, 4 * (parentargs_base + pa));
+                                       if (IS_2_WORD_TYPE(t))
+                                               M_DLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
 
-                                       } else {
-                                               M_FLD(var->regoff, REG_SP, 4 * (parentargs_base + pa));
-                                       }
+                                       else
+                                               M_FLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 4);
 
                                } else {                             /* stack-arg -> spilled  */
+#if 1
                                        if (IS_2_WORD_TYPE(t)) {
-                                               M_DLD(REG_FTMP1, REG_SP, 4 * (parentargs_base + pa));
+                                               M_DLD(REG_FTMP1, REG_SP, (cd->stackframesize + s1) * 4);
+                                               M_DST(REG_FTMP1, REG_SP, var->regoff * 4);
+                                               var->regoff = cd->stackframesize + s1;
 
                                        } else {
-                                               M_FLD(REG_FTMP1, REG_SP, 4 * (parentargs_base + pa));
+                                               M_FLD(REG_FTMP1, REG_SP, (cd->stackframesize + s1) * 4);
+                                               M_FST(REG_FTMP1, REG_SP, var->regoff * 4);
                                        }
-                                       M_DST(REG_FTMP1, REG_SP, 4 * var->regoff);
+#else
+                                       /* Reuse Memory Position on Caller Stack */
+                                       var->regoff = cd->stackframesize + s1;
+#endif
                                }
                        }
                }
        } /* end for */
-       }
 
+#if defined(ENABLE_THREADS)
        /* call monitorenter function */
 
-#if defined(USE_THREADS)
        if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
-               s4 func_enter = (m->flags & ACC_STATIC) ?
-                       (s4) builtin_staticmonitorenter : (s4) builtin_monitorenter;
-               p = dseg_addaddress(cd, (void *) func_enter);
+               /* stack offset for monitor argument */
+
+               s1 = rd->memuse;
+
+# if !defined(NDEBUG)
+               if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) {
+                       M_AADD_IMM(REG_SP, -((LA_SIZE_IN_POINTERS + ARG_CNT) * 8), REG_SP);
+
+                       for (p = 0; p < INT_ARG_CNT; p++)
+                               M_IST(rd->argintregs[p], REG_SP, LA_SIZE + p * 8);
+
+                       for (p = 0; p < FLT_ARG_CNT; p++)
+                               M_DST(rd->argfltregs[p], REG_SP, LA_SIZE + (INT_ARG_CNT + p) * 8);
+
+                       /* ATTENTION: We multiply here with 2, because we use * 8
+                          above for simplicity and below * 4! */
+
+                       s1 += (LA_SIZE_IN_POINTERS + ARG_CNT) * 2;
+               }
+# endif
+
+               p = dseg_add_functionptr(cd, LOCK_monitor_enter);
                M_ALD(REG_ITMP3, REG_PV, p);
                M_MTCTR(REG_ITMP3);
-               M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 4);
+
+               /* get or test the lock object */
+
+               if (m->flags & ACC_STATIC) {
+                       p = dseg_add_address(cd, &m->class->object.header);
+                       M_ALD(rd->argintregs[0], REG_PV, p);
+               }
+               else {
+                       M_TST(rd->argintregs[0]);
+                       M_BEQ(0);
+                       codegen_add_nullpointerexception_ref(cd);
+               }
+
+               M_AST(rd->argintregs[0], REG_SP, s1 * 4);
                M_JSR;
+
+# if !defined(NDEBUG)
+               if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) {
+                       for (p = 0; p < INT_ARG_CNT; p++)
+                               M_ILD(rd->argintregs[p], REG_SP, LA_SIZE + p * 8);
+
+                       for (p = 0; p < FLT_ARG_CNT; p++)
+                               M_DLD(rd->argfltregs[p], REG_SP, LA_SIZE + (INT_ARG_CNT + p) * 8);
+
+                       M_AADD_IMM(REG_SP, (LA_SIZE_IN_POINTERS + ARG_CNT) * 8, REG_SP);
+               }
+# endif
        }
-#endif
+#endif /* defined(ENABLE_THREADS) */
+
+       /* call trace function */
+
+       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+               emit_verbosecall_enter(jd);
        }
 
        /* end of header generation */
 
+       replacementpoint = code->rplpoints;
+
        /* walk through all basic blocks */
+
        for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
 
-               bptr->mpc = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+               bptr->mpc = (s4) (cd->mcodeptr - cd->mcodebase);
 
                if (bptr->flags >= BBREACHED) {
 
@@ -599,24 +407,49 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
                        }
                }
 
+               /* handle replacement points */
+
+               if (bptr->bitflags & BBFLAG_REPLACEMENT) {
+                       replacementpoint->pc = (u1*)(ptrint)bptr->mpc; /* will be resolved later */
+                       
+                       replacementpoint++;
+               }
+
+               /* generate basicblock profiling code */
+
+               if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
+                       /* count frequency */
+
+                       disp = dseg_add_address(cd, code->bbfrequency);
+                       M_ALD(REG_ITMP2, REG_PV, disp);
+                       M_ALD(REG_ITMP3, REG_ITMP2, bptr->nr * 4);
+                       M_IADD_IMM(REG_ITMP3, 1, REG_ITMP3);
+                       M_AST(REG_ITMP3, REG_ITMP2, bptr->nr * 4);
+
+                       /* if this is an exception handler, start profiling again */
+
+/*                     if (bptr->type == BBTYPE_EXH) */
+/*                             PROFILE_CYCLE_START; */
+               }
+
                /* copy interface registers to their destination */
 
                src = bptr->instack;
                len = bptr->indepth;
                MCODECHECK(64+len);
 
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
                if (opt_lsra) {
                        while (src != NULL) {
                                len--;
                                if ((len == 0) && (bptr->type != BBTYPE_STD)) {
-                                       /*                                                      d = reg_of_var(m, src, REG_ITMP1); */
+                                       /* d = reg_of_var(m, src, REG_ITMP1); */
                                        if (!(src->flags & INMEMORY))
-                                               d= src->regoff;
+                                               d = src->regoff;
                                        else
-                                               d=REG_ITMP1;
+                                               d = REG_ITMP1;
                                        M_INTMOVE(REG_ITMP1, d);
-                                       store_reg_to_var_int(src, d);
+                                       emit_store(jd, NULL, src, d);
                                }
                                src = src->prev;
                        }
@@ -625,67 +458,86 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
                while (src != NULL) {
                        len--;
                        if ((len == 0) && (bptr->type != BBTYPE_STD)) {
-                               d = reg_of_var(rd, src, REG_ITMP1);
+                               d = codegen_reg_of_var(rd, 0, src, REG_ITMP1);
                                M_INTMOVE(REG_ITMP1, d);
-                               store_reg_to_var_int(src, d);
-
-                       } else {
-                               d = reg_of_var(rd, src, REG_IFTMP);
+                               emit_store(jd, NULL, src, d);
+                       }
+                       else {
+                               if (src->type == TYPE_LNG)
+                                       d = codegen_reg_of_var(rd, 0, src, REG_ITMP12_PACKED);
+                               else
+                                       d = codegen_reg_of_var(rd, 0, src, REG_IFTMP);
                                if ((src->varkind != STACKVAR)) {
                                        s2 = src->type;
                                        if (IS_FLT_DBL_TYPE(s2)) {
                                                if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
                                                        s1 = rd->interfaces[len][s2].regoff;
-                                                       M_FLTMOVE(s1,d);
-
-                                               else {
+                                                       M_FLTMOVE(s1, d);
+                                               }
+                                               else {
                                                        if (IS_2_WORD_TYPE(s2)) {
-                                                               M_DLD(d, REG_SP, 4 * rd->interfaces[len][s2].regoff);
-
-                                                       } else {
-                                                               M_FLD(d, REG_SP, 4 * rd->interfaces[len][s2].regoff);
+                                                               M_DLD(d, REG_SP,
+                                                                         rd->interfaces[len][s2].regoff * 4);
                                                        }
+                                                       else {
+                                                               M_FLD(d, REG_SP,
+                                                                         rd->interfaces[len][s2].regoff * 4);
+                                                       }       
                                                }
-                                               store_reg_to_var_flt(src, d);
-
-                                       else {
+                                               emit_store(jd, NULL, src, d);
+                                       }
+                                       else {
                                                if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
                                                        s1 = rd->interfaces[len][s2].regoff;
-                                                       M_TINTMOVE(s2,s1,d);
-
-                                               } else {
-                                                       M_ILD(d, REG_SP, 4 * rd->interfaces[len][s2].regoff);
                                                        if (IS_2_WORD_TYPE(s2))
-                                                               M_ILD(rd->secondregs[d], REG_SP, 4 * rd->interfaces[len][s2].regoff + 4);
+                                                               M_LNGMOVE(s1, d);
+                                                       else
+                                                               M_INTMOVE(s1, d);
+                                               } 
+                                               else {
+                                                       if (IS_2_WORD_TYPE(s2))
+                                                               M_LLD(d, REG_SP,
+                                                                         rd->interfaces[len][s2].regoff * 4);
+                                                       else
+                                                               M_ILD(d, REG_SP,
+                                                                         rd->interfaces[len][s2].regoff * 4);
                                                }
-                                               store_reg_to_var_int(src, d);
+                                               emit_store(jd, NULL, src, d);
                                        }
                                }
                        }
                        src = src->prev;
                }
 
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
                }
 #endif
                /* walk through all instructions */
                
                src = bptr->instack;
                len = bptr->icount;
+               currentline = 0;
+
                for (iptr = bptr->iinstr; len > 0; src = iptr->dst, len--, iptr++) {
+                       if (iptr->line != currentline) {
+                               dseg_addlinenumber(cd, iptr->line);
+                               currentline = iptr->line;
+                       }
 
-       MCODECHECK(64);           /* an instruction usually needs < 64 words      */
-       switch (iptr->opc) {
+                       MCODECHECK(64);   /* an instruction usually needs < 64 words      */
 
-               case ICMD_NOP:        /* ...  ==> ...                                 */
-                       break;
+                       switch (iptr->opc) {
+                       case ICMD_NOP:    /* ...  ==> ...                                 */
+                       case ICMD_INLINE_START:
+                       case ICMD_INLINE_END:
+                               break;
 
-               case ICMD_NULLCHECKPOP: /* ..., objectref  ==> ...                    */
+               case ICMD_CHECKNULL:  /* ..., objectref  ==> ..., objectref           */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
                        M_TST(s1);
                        M_BEQ(0);
-                       codegen_addxnullrefs(cd, mcodeptr);
+                       codegen_add_nullpointerexception_ref(cd);
                        break;
 
                /* constant operations ************************************************/
@@ -693,130 +545,189 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
                case ICMD_ICONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.i = constant                    */
 
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
                        ICONST(d, iptr->val.i);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_LCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.l = constant                    */
 
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
                        LCONST(d, iptr->val.l);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.f = constant                    */
 
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
-                       a = dseg_addfloat(cd, iptr->val.f);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+                       a = dseg_add_float(cd, iptr->val.f);
                        M_FLD(d, REG_PV, a);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
                        
                case ICMD_DCONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.d = constant                    */
 
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
-                       a = dseg_adddouble(cd, iptr->val.d);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+                       a = dseg_add_double(cd, iptr->val.d);
                        M_DLD(d, REG_PV, a);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_ACONST:     /* ...  ==> ..., constant                       */
                                      /* op1 = 0, val.a = constant                    */
 
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
-                       ICONST(d, (u4) iptr->val.a);
-                       store_reg_to_var_int(iptr->dst, d);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               constant_classref *cr = ICMD_ACONST_UNRESOLVED_CLASSREF(iptr);;
+
+                               disp = dseg_add_unique_address(cd, cr);
+
+                               codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
+                                                                       cr, disp);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
+                       }
+                       else
+                               disp = dseg_add_address(cd, iptr->val.a);
+
+                       M_ALD(d, REG_PV, disp);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
 
                /* load/store operations **********************************************/
 
                case ICMD_ILOAD:      /* ...  ==> ..., content of local variable      */
-               case ICMD_LLOAD:      /* op1 = local variable                         */
-               case ICMD_ALOAD:
+               case ICMD_ALOAD:      /* op1 = local variable                         */
 
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
                        if ((iptr->dst->varkind == LOCALVAR) &&
                            (iptr->dst->varnum == iptr->op1))
                                break;
+                       if (var->flags & INMEMORY)
+                               M_ILD(d, REG_SP, var->regoff * 4);
+                       else
+                               M_INTMOVE(var->regoff, d);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
+
+               case ICMD_LLOAD:      /* ...  ==> ..., content of local variable      */
+                                     /* op1 = local variable                         */
+
                        var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
-                       if (var->flags & INMEMORY) {
-                               M_ILD(d, REG_SP, 4 * var->regoff);
-                               if (IS_2_WORD_TYPE(var->type))
-                                       M_ILD(rd->secondregs[d], REG_SP, 4 * var->regoff + 4);
-                       } else {
-                               M_TINTMOVE(var->type, var->regoff, d);
-                       }
-                       store_reg_to_var_int(iptr->dst, d);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       if ((iptr->dst->varkind == LOCALVAR) &&
+                               (iptr->dst->varnum == iptr->op1))
+                               break;
+                       if (var->flags & INMEMORY)
+                               M_LLD(d, REG_SP, var->regoff * 4);
+                       else
+                               M_LNGMOVE(var->regoff, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FLOAD:      /* ...  ==> ..., content of local variable      */
-               case ICMD_DLOAD:      /* op1 = local variable                         */
+                                     /* op1 = local variable                         */
 
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
                        if ((iptr->dst->varkind == LOCALVAR) &&
-                           (iptr->dst->varnum == iptr->op1))
+                               (iptr->dst->varnum == iptr->op1))
                                break;
                        var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
                        if (var->flags & INMEMORY)
-                               if (IS_2_WORD_TYPE(var->type))
-                                       M_DLD(d, REG_SP, 4 * var->regoff);
-                               else
-                                       M_FLD(d, REG_SP, 4 * var->regoff);
-                       else {
+                               M_FLD(d, REG_SP, var->regoff * 4);
+                       else
                                M_FLTMOVE(var->regoff, d);
-                       }
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
+
+               case ICMD_DLOAD:      /* ...  ==> ..., content of local variable      */
+                                     /* op1 = local variable                         */
+
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+                       if ((iptr->dst->varkind == LOCALVAR) &&
+                               (iptr->dst->varnum == iptr->op1))
+                               break;
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+                       if (var->flags & INMEMORY)
+                               M_DLD(d, REG_SP, var->regoff * 4);
+                       else
+                               M_FLTMOVE(var->regoff, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
 
                case ICMD_ISTORE:     /* ..., value  ==> ...                          */
-               case ICMD_LSTORE:     /* op1 = local variable                         */
-               case ICMD_ASTORE:
+               case ICMD_ASTORE:     /* op1 = local variable                         */
 
-                       if ((src->varkind == LOCALVAR) &&
-                           (src->varnum == iptr->op1))
+                       if ((src->varkind == LOCALVAR) && (src->varnum == iptr->op1))
                                break;
                        var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
                        if (var->flags & INMEMORY) {
-                               var_to_reg_int(s1, src, REG_ITMP1);
-                               M_IST(s1, REG_SP, 4 * var->regoff);
-                               if (IS_2_WORD_TYPE(var->type))
-                                       M_IST(rd->secondregs[s1], REG_SP, 4 * var->regoff + 4);
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                               M_IST(s1, REG_SP, var->regoff * 4);
                        } else {
-                               var_to_reg_int(s1, src, var->regoff);
-                               M_TINTMOVE(var->type, s1, var->regoff);
+                               s1 = emit_load_s1(jd, iptr, src, var->regoff);
+                               M_INTMOVE(s1, var->regoff);
                        }
                        break;
 
-               case ICMD_FSTORE:     /* ..., value  ==> ...                          */
-               case ICMD_DSTORE:     /* op1 = local variable                         */
+               case ICMD_LSTORE:     /* ..., value  ==> ...                          */
+                                     /* op1 = local variable                         */
 
-                       if ((src->varkind == LOCALVAR) &&
-                           (src->varnum == iptr->op1))
+                       if ((src->varkind == LOCALVAR) && (src->varnum == iptr->op1))
                                break;
                        var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
                        if (var->flags & INMEMORY) {
-                               var_to_reg_flt(s1, src, REG_FTMP1);
-                               if (var->type == TYPE_DBL)
-                                       M_DST(s1, REG_SP, 4 * var->regoff);
-                               else
-                                       M_FST(s1, REG_SP, 4 * var->regoff);
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP12_PACKED);
+                               M_LST(s1, REG_SP, var->regoff * 4);
                        } else {
-                               var_to_reg_flt(s1, src, var->regoff);
-                               M_FLTMOVE(s1, var->regoff);
+                               s1 = emit_load_s1(jd, iptr, src, var->regoff);
+                               M_LNGMOVE(s1, var->regoff);
                        }
                        break;
 
+               case ICMD_FSTORE:     /* ..., value  ==> ...                          */
+                                     /* op1 = local variable                         */
+
+                       if ((src->varkind == LOCALVAR) && (src->varnum == iptr->op1))
+                               break;
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+                       if (var->flags & INMEMORY) {
+                               s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                               M_FST(s1, REG_SP, var->regoff * 4);
+                       } else {
+                               s1 = emit_load_s1(jd, iptr, src, var->regoff);
+                               M_FLTMOVE(s1, var->regoff);
+                       }
+                       break;
+
+               case ICMD_DSTORE:     /* ..., value  ==> ...                          */
+                                     /* op1 = local variable                         */
+
+                       if ((src->varkind == LOCALVAR) && (src->varnum == iptr->op1))
+                               break;
+                       var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+                       if (var->flags & INMEMORY) {
+                               s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                               M_DST(s1, REG_SP, var->regoff * 4);
+                       } else {
+                               s1 = emit_load_s1(jd, iptr, src, var->regoff);
+                               M_FLTMOVE(s1, var->regoff);
+                       }
+                       break;
+
+
+               /* pop/dup/swap operations ********************************************/
+
+               /* attention: double and longs are only one entry in CACAO ICMDs      */
 
-               /* pop/dup/swap operations ********************************************/
-
-               /* attention: double and longs are only one entry in CACAO ICMDs      */
-
                case ICMD_POP:        /* ..., value  ==> ...                          */
                case ICMD_POP2:       /* ..., value, value  ==> ...                   */
                        break;
@@ -876,312 +787,361 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                case ICMD_INEG:       /* ..., value  ==> ..., - value                 */
 
-                       var_to_reg_int(s1, src, REG_ITMP1); 
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1); 
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_NEG(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-        case ICMD_LNEG:       /* ..., value  ==> ..., - value                 */
+               case ICMD_LNEG:       /* ..., value  ==> ..., - value                 */
 
-            var_to_reg_int(s1, src, REG_ITMP1);
-            d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-            M_SUBFIC(rd->secondregs[s1], 0, rd->secondregs[d]);
-            M_SUBFZE(s1, d);
-            store_reg_to_var_int(iptr->dst, d);
-            break;
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP12_PACKED);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       M_SUBFIC(GET_LOW_REG(s1), 0, GET_LOW_REG(d));
+                       M_SUBFZE(GET_HIGH_REG(s1), GET_HIGH_REG(d));
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
 
                case ICMD_I2L:        /* ..., value  ==> ..., value                   */
 
-                       var_to_reg_int(s1, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                       M_INTMOVE(s1, rd->secondregs[d]);
-                       M_SRA_IMM(rd->secondregs[d], 31, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       M_INTMOVE(s1, GET_LOW_REG(d));
+                       M_SRA_IMM(GET_LOW_REG(d), 31, GET_HIGH_REG(d));
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_L2I:        /* ..., value  ==> ..., value                   */
 
-                       var_to_reg_int0(s1, src, REG_ITMP2, 0, 1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP2);
-                       M_INTMOVE(s1, d );
-                       store_reg_to_var_int(iptr->dst, d);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                       M_INTMOVE(s1, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_INT2BYTE:   /* ..., value  ==> ..., value                   */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_BSEXT(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_INT2CHAR:   /* ..., value  ==> ..., value                   */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-            M_CZEXT(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                       M_CZEXT(s1, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_INT2SHORT:  /* ..., value  ==> ..., value                   */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_SSEXT(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
 
                case ICMD_IADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_IADD(s1, s2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IADDCONST:  /* ..., value  ==> ..., value + constant        */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
                                M_IADD_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_IADD(s1, REG_ITMP2, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-        case ICMD_LADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
+               case ICMD_LADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
 
-            var_to_reg_int0(s1, src->prev, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 0, 1);
-            d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-            M_ADDC(s1, s2, rd->secondregs[d]);
-            var_to_reg_int0(s1, src->prev, REG_ITMP1, 1, 0);
-            var_to_reg_int0(s2, src, REG_ITMP3, 1, 0);
-            M_ADDE(s1, s2, d);
-            store_reg_to_var_int(iptr->dst, d);
-            break;
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       M_ADDC(s1, s2, GET_LOW_REG(d));
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3);   /* don't use REG_ITMP2 */
+                       M_ADDE(s1, s2, GET_HIGH_REG(d));
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
 
                case ICMD_LADDCONST:  /* ..., value  ==> ..., value + constant        */
                                      /* val.l = constant                             */
 
                        s3 = iptr->val.l & 0xffffffff;
-                       var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
                        if ((s3 >= -32768) && (s3 <= 32767)) {
-                               M_ADDIC(s1, s3, rd->secondregs[d]);
-                               }
-                       else {
+                               M_ADDIC(s1, s3, GET_LOW_REG(d));
+                       } else {
                                ICONST(REG_ITMP2, s3);
-                               M_ADDC(s1, REG_ITMP2, rd->secondregs[d]);
-                               }
-                       var_to_reg_int0(s1, src, REG_ITMP1, 1, 0);
+                               M_ADDC(s1, REG_ITMP2, GET_LOW_REG(d));
+                       }
+                       s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
                        s3 = iptr->val.l >> 32;
-                       if (s3 == -1)
-                               M_ADDME(s1, d);
-                       else if (s3 == 0)
-                               M_ADDZE(s1, d);
-                       else {
-                               ICONST(REG_ITMP3, s3);
-                               M_ADDE(s1, REG_ITMP3, d);
+                       if (s3 == -1) {
+                               M_ADDME(s1, GET_HIGH_REG(d));
+                       } else if (s3 == 0) {
+                               M_ADDZE(s1, GET_HIGH_REG(d));
+                       else {
+                               ICONST(REG_ITMP3, s3);                 /* don't use REG_ITMP2 */
+                               M_ADDE(s1, REG_ITMP3, GET_HIGH_REG(d));
                        }
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_ISUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_ISUB(s1, s2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_ISUBCONST:  /* ..., value  ==> ..., value + constant        */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= -32767) && (iptr->val.i <= 32768)) {
                                M_IADD_IMM(s1, -iptr->val.i, d);
-                               }
-                       else {
+                       } else {
                                ICONST(REG_ITMP2, -iptr->val.i);
                                M_IADD(s1, REG_ITMP2, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-        case ICMD_LSUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
+               case ICMD_LSUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
 
-            var_to_reg_int0(s1, src->prev, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 0, 1);
-            d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-            M_SUBC(s1, s2, rd->secondregs[d]);
-            var_to_reg_int0(s1, src->prev, REG_ITMP1, 1, 0);
-            var_to_reg_int0(s2, src, REG_ITMP3, 1, 0);
-            M_SUBE(s1, s2, d);
-            store_reg_to_var_int(iptr->dst, d);
-            break;
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       M_SUBC(s1, s2, GET_LOW_REG(d));
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3);   /* don't use REG_ITMP2 */
+                       M_SUBE(s1, s2, GET_HIGH_REG(d));
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
 
                case ICMD_LSUBCONST:  /* ..., value  ==> ..., value - constant        */
                                      /* val.l = constant                             */
 
                        s3 = (-iptr->val.l) & 0xffffffff;
-                       var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
                        if ((s3 >= -32768) && (s3 <= 32767)) {
-                               M_ADDIC(s1, s3, rd->secondregs[d]);
-                               }
-                       else {
+                               M_ADDIC(s1, s3, GET_LOW_REG(d));
+                       } else {
                                ICONST(REG_ITMP2, s3);
-                               M_ADDC(s1, REG_ITMP2, rd->secondregs[d]);
-                               }
-                       var_to_reg_int0(s1, src, REG_ITMP1, 1, 0);
+                               M_ADDC(s1, REG_ITMP2, GET_LOW_REG(d));
+                       }
+                       s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
                        s3 = (-iptr->val.l) >> 32;
                        if (s3 == -1)
-                               M_ADDME(s1, d);
+                               M_ADDME(s1, GET_HIGH_REG(d));
                        else if (s3 == 0)
-                               M_ADDZE(s1, d);
+                               M_ADDZE(s1, GET_HIGH_REG(d));
                        else {
-                               ICONST(REG_ITMP3, s3);
-                               M_ADDE(s1, REG_ITMP3, d);
+                               ICONST(REG_ITMP3, s3);                 /* don't use REG_ITMP2 */
+                               M_ADDE(s1, REG_ITMP3, GET_HIGH_REG(d));
                        }
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
+                       M_TST(s2);
+                       M_BEQ(0);
+                       codegen_add_arithmeticexception_ref(cd);
+                       M_LDAH(REG_ITMP3, REG_ZERO, 0x8000);
+                       M_CMP(REG_ITMP3, s1);
+                       M_BNE(3 + (s1 != d));
+                       M_CMPI(s2, -1);
+                       M_BNE(1 + (s1 != d));
+                       M_INTMOVE(s1, d);
+                       M_BR(1);
                        M_IDIV(s1, s2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                       M_IDIV(s1, s2, d);
-                       M_IMUL(d, s2, d);
-                       M_ISUB(s1, d, d);
-                       store_reg_to_var_int(iptr->dst, d);
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                       M_TST(s2);
+                       M_BEQ(0);
+                       codegen_add_arithmeticexception_ref(cd);
+                       M_LDAH(REG_ITMP3, REG_ZERO, 0x8000);
+                       M_CMP(REG_ITMP3, s1);
+                       M_BNE(4);
+                       M_CMPI(s2, -1);
+                       M_BNE(2);
+                       M_CLR(d);
+                       M_BR(3);
+                       M_IDIV(s1, s2, REG_ITMP3);
+                       M_IMUL(REG_ITMP3, s2, REG_ITMP3);
+                       M_ISUB(s1, REG_ITMP3, d);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
+
+               case ICMD_LDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
+               case ICMD_LREM:       /* ..., val1, val2  ==> ..., val1 % val2        */
+
+                       bte = iptr->val.a;
+                       md = bte->md;
+
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP12_PACKED);
+                       M_OR_TST(GET_HIGH_REG(s2), GET_LOW_REG(s2), REG_ITMP3);
+                       M_BEQ(0);
+                       codegen_add_arithmeticexception_ref(cd);
+
+                       disp = dseg_add_functionptr(cd, bte->fp);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_MTCTR(REG_ITMP3);
+
+                       s3 = PACK_REGS(rd->argintregs[GET_LOW_REG(md->params[1].regoff)],
+                                                  rd->argintregs[GET_HIGH_REG(md->params[1].regoff)]);
+                       M_LNGMOVE(s2, s3);
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP12_PACKED);
+                       s3 = PACK_REGS(rd->argintregs[GET_LOW_REG(md->params[0].regoff)],
+                                                  rd->argintregs[GET_HIGH_REG(md->params[0].regoff)]);
+                       M_LNGMOVE(s1, s3);
+
+                       M_JSR;
+
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT_PACKED);
+                       M_LNGMOVE(REG_RESULT_PACKED, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IMUL:       /* ..., val1, val2  ==> ..., val1 * val2        */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_IMUL(s1, s2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IMULCONST:  /* ..., value  ==> ..., value * constant        */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
                                M_IMUL_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, iptr->val.i);
-                               M_IMUL(s1, REG_ITMP2, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                       } else {
+                               ICONST(REG_ITMP3, iptr->val.i);
+                               M_IMUL(s1, REG_ITMP3, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IDIVPOW2:   /* ..., value  ==> ..., value << constant       */
                                      
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
                        M_SRA_IMM(s1, iptr->val.i, d);
                        M_ADDZE(d, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_ISHL:       /* ..., val1, val2  ==> ..., val1 << val2       */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_AND_IMM(s2, 0x1f, REG_ITMP3);
                        M_SLL(s1, REG_ITMP3, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_ISHLCONST:  /* ..., value  ==> ..., value << constant       */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_SLL_IMM(s1, iptr->val.i & 0x1f, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_ISHR:       /* ..., val1, val2  ==> ..., val1 >> val2       */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_AND_IMM(s2, 0x1f, REG_ITMP3);
                        M_SRA(s1, REG_ITMP3, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_ISHRCONST:  /* ..., value  ==> ..., value >> constant       */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_SRA_IMM(s1, iptr->val.i & 0x1f, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IUSHR:      /* ..., val1, val2  ==> ..., val1 >>> val2      */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_AND_IMM(s2, 0x1f, REG_ITMP2);
                        M_SRL(s1, REG_ITMP2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IUSHRCONST: /* ..., value  ==> ..., value >>> constant      */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                       if (iptr->val.i & 0x1f)
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                       if (iptr->val.i & 0x1f) {
                                M_SRL_IMM(s1, iptr->val.i & 0x1f, d);
-                       else
+                       } else {
                                M_INTMOVE(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IAND:       /* ..., val1, val2  ==> ..., val1 & val2        */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_AND(s1, s2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IANDCONST:  /* ..., value  ==> ..., value & constant        */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= 0) && (iptr->val.i <= 65535)) {
                                M_AND_IMM(s1, iptr->val.i, d);
                                }
@@ -1191,64 +1151,62 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
                                }
                        */
                        else {
-                               ICONST(REG_ITMP2, iptr->val.i);
-                               M_AND(s1, REG_ITMP2, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                               ICONST(REG_ITMP3, iptr->val.i);
+                               M_AND(s1, REG_ITMP3, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_LAND:       /* ..., val1, val2  ==> ..., val1 & val2        */
 
-                       var_to_reg_int0(s1, src->prev, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 0, 1);
-            d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-            M_AND(s1, s2, rd->secondregs[d]);
-            var_to_reg_int0(s1, src->prev, REG_ITMP1, 1, 0);
-            var_to_reg_int0(s2, src, REG_ITMP3, 1, 0);
-            M_AND(s1, s2, d);
-            store_reg_to_var_int(iptr->dst, d);
-            break;
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       M_AND(s1, s2, GET_LOW_REG(d));
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3);   /* don't use REG_ITMP2 */
+                       M_AND(s1, s2, GET_HIGH_REG(d));
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
 
                case ICMD_LANDCONST:  /* ..., value  ==> ..., value & constant        */
                                      /* val.l = constant                             */
 
                        s3 = iptr->val.l & 0xffffffff;
-                       var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
                        if ((s3 >= 0) && (s3 <= 65535)) {
-                               M_AND_IMM(s1, s3, rd->secondregs[d]);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_AND(s1, REG_ITMP2, rd->secondregs[d]);
-                               }
-                       var_to_reg_int0(s1, src, REG_ITMP1, 1, 0);
+                               M_AND_IMM(s1, s3, GET_LOW_REG(d));
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_AND(s1, REG_ITMP3, GET_LOW_REG(d));
+                       }
+                       s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
                        s3 = iptr->val.l >> 32;
                        if ((s3 >= 0) && (s3 <= 65535)) {
-                               M_AND_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP3, s3);
-                               M_AND(s1, REG_ITMP3, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                               M_AND_IMM(s1, s3, GET_HIGH_REG(d));
+                       } else {
+                               ICONST(REG_ITMP3, s3);                 /* don't use REG_ITMP2 */
+                               M_AND(s1, REG_ITMP3, GET_HIGH_REG(d));
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IREMPOW2:   /* ..., value  ==> ..., value % constant        */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_MOV(s1, REG_ITMP2);
                        M_CMPI(s1, 0);
                        M_BGE(1 + 2*(iptr->val.i >= 32768));
                        if (iptr->val.i >= 32768) {
-                               M_ADDIS(REG_ZERO, iptr->val.i>>16, REG_ITMP2);
+                               M_ADDIS(REG_ZERO, iptr->val.i >> 16, REG_ITMP2);
                                M_OR_IMM(REG_ITMP2, iptr->val.i, REG_ITMP2);
                                M_IADD(s1, REG_ITMP2, REG_ITMP2);
-                               } 
-                       else
+                       } else {
                                M_IADD_IMM(s1, iptr->val.i, REG_ITMP2);
+                       }
                        {
                                int b=0, m = iptr->val.i;
                                while (m >>= 1)
@@ -1256,181 +1214,190 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
                                M_RLWINM(REG_ITMP2, 0, 0, 30-b, REG_ITMP2);
                        }
                        M_ISUB(s1, REG_ITMP2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IOR:        /* ..., val1, val2  ==> ..., val1 | val2        */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_OR(s1, s2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IORCONST:   /* ..., value  ==> ..., value | constant        */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= 0) && (iptr->val.i <= 65535)) {
                                M_OR_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, iptr->val.i);
-                               M_OR(s1, REG_ITMP2, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                       } else {
+                               ICONST(REG_ITMP3, iptr->val.i);
+                               M_OR(s1, REG_ITMP3, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_LOR:       /* ..., val1, val2  ==> ..., val1 | val2        */
 
-                       var_to_reg_int0(s1, src->prev, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 0, 1);
-            d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-            M_OR(s1, s2, rd->secondregs[d]);
-            var_to_reg_int0(s1, src->prev, REG_ITMP1, 1, 0);
-            var_to_reg_int0(s2, src, REG_ITMP3, 1, 0);
-            M_OR(s1, s2, d);
-            store_reg_to_var_int(iptr->dst, d);
-            break;
-
-               case ICMD_LORCONST:  /* ..., value  ==> ..., value | constant        */
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       M_OR(s1, s2, GET_LOW_REG(d));
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3);   /* don't use REG_ITMP2 */
+                       M_OR(s1, s2, GET_HIGH_REG(d));
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
+
+               case ICMD_LORCONST:   /* ..., value  ==> ..., value | constant        */
                                      /* val.l = constant                             */
 
                        s3 = iptr->val.l & 0xffffffff;
-                       var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
                        if ((s3 >= 0) && (s3 <= 65535)) {
-                               M_OR_IMM(s1, s3, rd->secondregs[d]);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_OR(s1, REG_ITMP2, rd->secondregs[d]);
-                               }
-                       var_to_reg_int0(s1, src, REG_ITMP1, 1, 0);
+                               M_OR_IMM(s1, s3, GET_LOW_REG(d));
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_OR(s1, REG_ITMP3, GET_LOW_REG(d));
+                       }
+                       s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
                        s3 = iptr->val.l >> 32;
                        if ((s3 >= 0) && (s3 <= 65535)) {
-                               M_OR_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP3, s3);
-                               M_OR(s1, REG_ITMP3, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                               M_OR_IMM(s1, s3, GET_HIGH_REG(d));
+                       } else {
+                               ICONST(REG_ITMP3, s3);                 /* don't use REG_ITMP2 */
+                               M_OR(s1, REG_ITMP3, GET_HIGH_REG(d));
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IXOR:       /* ..., val1, val2  ==> ..., val1 ^ val2        */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_XOR(s1, s2, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IXORCONST:  /* ..., value  ==> ..., value ^ constant        */
                                      /* val.i = constant                             */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if ((iptr->val.i >= 0) && (iptr->val.i <= 65535)) {
                                M_XOR_IMM(s1, iptr->val.i, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, iptr->val.i);
-                               M_XOR(s1, REG_ITMP2, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                       } else {
+                               ICONST(REG_ITMP3, iptr->val.i);
+                               M_XOR(s1, REG_ITMP3, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_LXOR:       /* ..., val1, val2  ==> ..., val1 ^ val2        */
 
-                       var_to_reg_int0(s1, src->prev, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 0, 1);
-            d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-            M_XOR(s1, s2, rd->secondregs[d]);
-            var_to_reg_int0(s1, src->prev, REG_ITMP1, 1, 0);
-            var_to_reg_int0(s2, src, REG_ITMP3, 1, 0);
-            M_XOR(s1, s2, d);
-            store_reg_to_var_int(iptr->dst, d);
-            break;
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       M_XOR(s1, s2, GET_LOW_REG(d));
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP3);   /* don't use REG_ITMP2 */
+                       M_XOR(s1, s2, GET_HIGH_REG(d));
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
 
                case ICMD_LXORCONST:  /* ..., value  ==> ..., value ^ constant        */
                                      /* val.l = constant                             */
 
                        s3 = iptr->val.l & 0xffffffff;
-                       var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
                        if ((s3 >= 0) && (s3 <= 65535)) {
-                               M_XOR_IMM(s1, s3, rd->secondregs[d]);
-                               }
-                       else {
-                               ICONST(REG_ITMP2, s3);
-                               M_XOR(s1, REG_ITMP2, rd->secondregs[d]);
-                               }
-                       var_to_reg_int0(s1, src, REG_ITMP1, 1, 0);
+                               M_XOR_IMM(s1, s3, GET_LOW_REG(d));
+                       } else {
+                               ICONST(REG_ITMP3, s3);
+                               M_XOR(s1, REG_ITMP3, GET_LOW_REG(d));
+                       }
+                       s1 = emit_load_s1_high(jd, iptr, src, REG_ITMP1);
                        s3 = iptr->val.l >> 32;
                        if ((s3 >= 0) && (s3 <= 65535)) {
-                               M_XOR_IMM(s1, s3, d);
-                               }
-                       else {
-                               ICONST(REG_ITMP3, s3);
-                               M_XOR(s1, REG_ITMP3, d);
-                               }
-                       store_reg_to_var_int(iptr->dst, d);
+                               M_XOR_IMM(s1, s3, GET_HIGH_REG(d));
+                       } else {
+                               ICONST(REG_ITMP3, s3);                 /* don't use REG_ITMP2 */
+                               M_XOR(s1, REG_ITMP3, GET_HIGH_REG(d));
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_LCMP:       /* ..., val1, val2  ==> ..., val1 cmp val2      */
-
-                       var_to_reg_int0(s1, src->prev, REG_ITMP3, 1, 0);
-                       var_to_reg_int0(s2, src, REG_ITMP2, 1, 0);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
+                       /*******************************************************************
+                TODO: CHANGE THIS TO A VERSION THAT WORKS !!!
+                       *******************************************************************/
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP3);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
                        {
-                               int tempreg =
-                                       (d==s1 || d==s2 || d==rd->secondregs[s1] || d==rd->secondregs[s2]);
-                               int dreg = tempreg ? REG_ITMP1 : d;
-                               s4 *br1;
+                               int tempreg = false;
+                               int dreg;
+                               u1  *br1;
+
+                               if (src->prev->flags & INMEMORY) {
+                                       tempreg = tempreg || (d == REG_ITMP3) || (d == REG_ITMP2);
+                               } else {
+                                       tempreg = tempreg || (d == GET_HIGH_REG(src->prev->regoff))
+                                                       || (d == GET_LOW_REG(src->prev->regoff));
+                               }
+                               if (src->flags & INMEMORY) {
+                                       tempreg = tempreg || (d == REG_ITMP3) || (d == REG_ITMP2);
+                               } else {
+                                       tempreg = tempreg || (d == GET_HIGH_REG(src->regoff))
+                                 || (d == GET_LOW_REG(src->regoff));
+                               }
+
+                               dreg = tempreg ? REG_ITMP1 : d;
                                M_IADD_IMM(REG_ZERO, 1, dreg);
                                M_CMP(s1, s2);
                                M_BGT(0);
-                               br1 = mcodeptr;
+                               br1 = cd->mcodeptr;
                                M_BLT(0);
-                               var_to_reg_int0(s1, src->prev, REG_ITMP3, 0, 1);
-                               var_to_reg_int0(s2, src, REG_ITMP2, 0, 1);
+                               s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP3);
+                               s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
                                M_CMPU(s1, s2);
                                M_BGT(3);
                                M_BEQ(1);
                                M_IADD_IMM(dreg, -1, dreg);
                                M_IADD_IMM(dreg, -1, dreg);
-                               gen_resolvebranch(br1, (u1*) br1, (u1*) mcodeptr);
-                               gen_resolvebranch(br1+1, (u1*) (br1+1), (u1*) (mcodeptr-2));
+                               gen_resolvebranch(br1, br1, cd->mcodeptr);
+                               gen_resolvebranch(br1 + 1 * 4, br1 + 1 * 4, cd->mcodeptr - 2 * 4);
                                M_INTMOVE(dreg, d);
                        }
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IINC:       /* ..., value  ==> ..., value + constant        */
                                      /* op1 = variable, val.i = constant             */
 
-            var = &(rd->locals[iptr->op1][TYPE_INT]);
-            if (var->flags & INMEMORY) {
-                s1 = REG_ITMP1;
-                M_ILD(s1, REG_SP, 4 * var->regoff);
-                }
-            else
-                s1 = var->regoff;
+                       var = &(rd->locals[iptr->op1][TYPE_INT]);
+                       if (var->flags & INMEMORY) {
+                               s1 = REG_ITMP1;
+                               M_ILD(s1, REG_SP, var->regoff * 4);
+                       } else
+                               s1 = var->regoff;
                        {
                                u4 m = iptr->val.i;
-                               if (m&0x8000)
+                               if (m & 0x8000)
                                        m += 65536;
-                               if (m&0xffff0000)
-                                       M_ADDIS(s1, m>>16, s1);
-                               if (m&0xffff)
-                                       M_IADD_IMM(s1, m&0xffff, s1);
+                               if (m & 0xffff0000)
+                                       M_ADDIS(s1, m >> 16, s1);
+                               if (m & 0xffff)
+                                       M_IADD_IMM(s1, m & 0xffff, s1);
                        }
-            if (var->flags & INMEMORY)
-                               M_IST(s1, REG_SP, 4 * var->regoff);
+                       if (var->flags & INMEMORY)
+                               M_IST(s1, REG_SP, var->regoff * 4);
                        break;
 
 
@@ -1438,328 +1405,489 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                case ICMD_FNEG:       /* ..., value  ==> ..., - value                 */
 
-                       var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_FMOVN(s1, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_DNEG:       /* ..., value  ==> ..., - value                 */
 
-                       var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_FMOVN(s1, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_FADD(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_DADD:       /* ..., val1, val2  ==> ..., val1 + val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_DADD(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FSUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_FSUB(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_DSUB:       /* ..., val1, val2  ==> ..., val1 - val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_DSUB(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FMUL:       /* ..., val1, val2  ==> ..., val1 * val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_FMUL(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-               case ICMD_DMUL:       /* ..., val1, val2  ==> ..., val1 *** val2        */
+               case ICMD_DMUL:       /* ..., val1, val2  ==> ..., val1 * val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_DMUL(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_FDIV(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_DDIV:       /* ..., val1, val2  ==> ..., val1 / val2        */
 
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_DDIV(s1, s2, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
                
                case ICMD_F2I:       /* ..., value  ==> ..., (int) value              */
                case ICMD_D2I:
-                       var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+
+                       s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        M_CLR(d);
-                       a = dseg_addfloat(cd, 0.0);
-                       M_FLD(REG_FTMP2, REG_PV, a);
+                       disp = dseg_add_float(cd, 0.0);
+                       M_FLD(REG_FTMP2, REG_PV, disp);
                        M_FCMPU(s1, REG_FTMP2);
                        M_BNAN(4);
-                       a = dseg_adds4(cd, 0);
+                       disp = dseg_add_unique_s4(cd, 0);
                        M_CVTDL_C(s1, REG_FTMP1);
-                       M_LDA (REG_ITMP1, REG_PV, a);
+                       M_LDA(REG_ITMP1, REG_PV, disp);
                        M_STFIWX(REG_FTMP1, 0, REG_ITMP1);
-                       M_ILD (d, REG_PV, a);
-                       store_reg_to_var_int(iptr->dst, d);
+                       M_ILD(d, REG_PV, disp);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
                
                case ICMD_F2D:       /* ..., value  ==> ..., (double) value           */
 
-                       var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_FLTMOVE(s1, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
                                        
                case ICMD_D2F:       /* ..., value  ==> ..., (double) value           */
 
-                       var_to_reg_flt(s1, src, REG_FTMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
                        M_CVTDF(s1, d);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
                
                case ICMD_FCMPL:      /* ..., val1, val2  ==> ..., val1 fcmpg val2    */
-               case ICMD_DCMPL:
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+               case ICMD_DCMPL:      /* == => 0, < => 1, > => -1                     */
+
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
                        M_FCMPU(s2, s1);
-                       M_IADD_IMM(0, -1, d);
+                       M_IADD_IMM(REG_ZERO, -1, d);
                        M_BNAN(4);
                        M_BGT(3);
-                       M_IADD_IMM(0, 0, d);
+                       M_IADD_IMM(REG_ZERO, 0, d);
                        M_BGE(1);
-                       M_IADD_IMM(0, 1, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       M_IADD_IMM(REG_ZERO, 1, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FCMPG:      /* ..., val1, val2  ==> ..., val1 fcmpl val2    */
-               case ICMD_DCMPG:
-                       var_to_reg_flt(s1, src->prev, REG_FTMP1);
-                       var_to_reg_flt(s2, src, REG_FTMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+               case ICMD_DCMPG:      /* == => 0, < => 1, > => -1                     */
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
                        M_FCMPU(s1, s2);
-                       M_IADD_IMM(0, 1, d);
+                       M_IADD_IMM(REG_ZERO, 1, d);
                        M_BNAN(4);
                        M_BGT(3);
-                       M_IADD_IMM(0, 0, d);
+                       M_IADD_IMM(REG_ZERO, 0, d);
                        M_BGE(1);
-                       M_IADD_IMM(0, -1, d);
-                       store_reg_to_var_int(iptr->dst, d);
+                       M_IADD_IMM(REG_ZERO, -1, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
                        
+               case ICMD_IF_FCMPEQ:    /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPEQ:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(1);
+                       M_BEQ(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPNE:    /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPNE:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       M_BNE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+
+               case ICMD_IF_FCMPL_LT:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPL_LT:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       M_BLT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPL_GT:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPL_GT:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(1);
+                       M_BGT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPL_LE:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPL_LE:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       M_BLE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPL_GE:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPL_GE:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(1);
+                       M_BGE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPG_LT:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPG_LT:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(1);
+                       M_BLT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPG_GT:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPG_GT:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       M_BGT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPG_LE:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPG_LE:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(1);
+                       M_BLE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_FCMPG_GE:  /* ..., value, value ==> ...                  */
+               case ICMD_IF_DCMPG_GE:
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_FTMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+                       M_FCMPU(s1, s2);
+                       M_BNAN(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       M_BGE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
 
                /* memory operations **************************************************/
 
                case ICMD_ARRAYLENGTH: /* ..., arrayref  ==> ..., length              */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        gen_nullptr_check(s1);
                        M_ILD(d, s1, OFFSET(java_arrayheader, size));
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-               case ICMD_AALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_BALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_SLL_IMM(s2, 2, REG_ITMP2);
-                       M_IADD_IMM(REG_ITMP2, OFFSET(java_objectarray, data[0]), REG_ITMP2);
-                       M_LWZX(d, s1, REG_ITMP2);
-                       store_reg_to_var_int(iptr->dst, d);
+                       }
+                       M_IADD_IMM(s2, OFFSET(java_chararray, data[0]), REG_ITMP2);
+                       M_LBZX(d, s1, REG_ITMP2);
+                       M_BSEXT(d, d);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;                  
+
+               case ICMD_CALOAD:     /* ..., arrayref, index  ==> ..., value         */
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
+                       M_SLL_IMM(s2, 1, REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP2, OFFSET(java_chararray, data[0]), REG_ITMP2);
+                       M_LHZX(d, s1, REG_ITMP2);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-               case ICMD_LALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_SALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_SLL_IMM(s2, 3, REG_ITMP2);
-                       M_IADD(s1, REG_ITMP2, REG_ITMP2);
-                       M_ILD(d, REG_ITMP2, OFFSET(java_longarray, data[0]));
-                       M_ILD(rd->secondregs[d], REG_ITMP2, OFFSET(java_longarray, data[0])+4);
-                       store_reg_to_var_int(iptr->dst, d);
+                       }
+                       M_SLL_IMM(s2, 1, REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
+                       M_LHAX(d, s1, REG_ITMP2);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_IALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
+                       }
                        M_SLL_IMM(s2, 2, REG_ITMP2);
                        M_IADD_IMM(REG_ITMP2, OFFSET(java_intarray, data[0]), REG_ITMP2);
                        M_LWZX(d, s1, REG_ITMP2);
-                       store_reg_to_var_int(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
+
+               case ICMD_LALOAD:     /* ..., arrayref, index  ==> ..., value         */
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
+                       M_SLL_IMM(s2, 3, REG_ITMP2);
+                       M_IADD(s1, REG_ITMP2, REG_ITMP2);
+                       M_LLD_INTERN(d, REG_ITMP2, OFFSET(java_longarray, data[0]));
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_FALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
+                       }
                        M_SLL_IMM(s2, 2, REG_ITMP2);
                        M_IADD_IMM(REG_ITMP2, OFFSET(java_floatarray, data[0]), REG_ITMP2);
                        M_LFSX(d, s1, REG_ITMP2);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
                case ICMD_DALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_FTMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
+                       }
                        M_SLL_IMM(s2, 3, REG_ITMP2);
                        M_IADD_IMM(REG_ITMP2, OFFSET(java_doublearray, data[0]), REG_ITMP2);
                        M_LFDX(d, s1, REG_ITMP2);
-                       store_reg_to_var_flt(iptr->dst, d);
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-               case ICMD_BALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_AALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_IADD_IMM(s2, OFFSET(java_chararray, data[0]), REG_ITMP2);
-                       M_LBZX(d, s1, REG_ITMP2);
-                       M_BSEXT(d, d);
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;                  
+                       }
+                       M_SLL_IMM(s2, 2, REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP2, OFFSET(java_objectarray, data[0]), REG_ITMP2);
+                       M_LWZX(d, s1, REG_ITMP2);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
 
-               case ICMD_SALOAD:     /* ..., arrayref, index  ==> ..., value         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+               case ICMD_BASTORE:    /* ..., arrayref, index, value  ==> ...         */
+
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       M_SLL_IMM(s2, 1, REG_ITMP2);
-                       M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
-                       M_LHAX(d, s1, REG_ITMP2);
-                       store_reg_to_var_int(iptr->dst, d);
+                       }
+                       s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+                       M_IADD_IMM(s2, OFFSET(java_bytearray, data[0]), REG_ITMP2);
+                       M_STBX(s3, s1, REG_ITMP2);
                        break;
 
-               case ICMD_CALOAD:     /* ..., arrayref, index  ==> ..., value         */
+               case ICMD_CASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
+                       }
+                       s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
                        M_SLL_IMM(s2, 1, REG_ITMP2);
                        M_IADD_IMM(REG_ITMP2, OFFSET(java_chararray, data[0]), REG_ITMP2);
-                       M_LHZX(d, s1, REG_ITMP2);
-                       store_reg_to_var_int(iptr->dst, d);
+                       M_STHX(s3, s1, REG_ITMP2);
                        break;
 
-               case ICMD_LASTORE:    /* ..., arrayref, index, value  ==> ...         */
+               case ICMD_SASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
-                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_int0(s3, src, REG_ITMP3, 1, 0);
-                       M_SLL_IMM(s2, 3, REG_ITMP2);
-                       M_IADD_IMM(REG_ITMP2, OFFSET(java_intarray, data[0]), REG_ITMP2);
-                       M_STWX(s3, s1, REG_ITMP2);
-                       M_IADD_IMM(REG_ITMP2, 4, REG_ITMP2);
-                       var_to_reg_int0(s3, src, REG_ITMP3, 0, 1);
-                       M_STWX(s3, s1, REG_ITMP2);
+                       }
+                       s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+                       M_SLL_IMM(s2, 1, REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
+                       M_STHX(s3, s1, REG_ITMP2);
                        break;
 
                case ICMD_IASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
-                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_int(s3, src, REG_ITMP3);
+                       }
+                       s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
                        M_SLL_IMM(s2, 2, REG_ITMP2);
                        M_IADD_IMM(REG_ITMP2, OFFSET(java_intarray, data[0]), REG_ITMP2);
                        M_STWX(s3, s1, REG_ITMP2);
                        break;
 
+               case ICMD_LASTORE:    /* ..., arrayref, index, value  ==> ...         */
+
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
+                       if (iptr->op1 == 0) {
+                               gen_nullptr_check(s1);
+                               gen_bound_check;
+                       }
+                       s3 = emit_load_s3_high(jd, iptr, src, REG_ITMP3);
+                       M_SLL_IMM(s2, 3, REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP2, OFFSET(java_longarray, data[0]), REG_ITMP2);
+                       M_STWX(s3, s1, REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP2, 4, REG_ITMP2);
+                       s3 = emit_load_s3_low(jd, iptr, src, REG_ITMP3);
+                       M_STWX(s3, s1, REG_ITMP2);
+                       break;
+
                case ICMD_FASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
-                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_flt(s3, src, REG_FTMP3);
+                       }
+                       s3 = emit_load_s3(jd, iptr, src, REG_FTMP3);
                        M_SLL_IMM(s2, 2, REG_ITMP2);
                        M_IADD_IMM(REG_ITMP2, OFFSET(java_floatarray, data[0]), REG_ITMP2);
                        M_STFSX(s3, s1, REG_ITMP2);
@@ -1767,254 +1895,257 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                case ICMD_DASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
-                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_flt(s3, src, REG_FTMP3);
+                       }
+                       s3 = emit_load_s3(jd, iptr, src, REG_FTMP3);
                        M_SLL_IMM(s2, 3, REG_ITMP2);
                        M_IADD_IMM(REG_ITMP2, OFFSET(java_doublearray, data[0]), REG_ITMP2);
                        M_STFDX(s3, s1, REG_ITMP2);
                        break;
 
-               case ICMD_BASTORE:    /* ..., arrayref, index, value  ==> ...         */
+               case ICMD_AASTORE:    /* ..., arrayref, index, value  ==> ...         */
 
-                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src->prev, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, rd->argintregs[0]);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
                        if (iptr->op1 == 0) {
                                gen_nullptr_check(s1);
                                gen_bound_check;
-                               }
-                       var_to_reg_int(s3, src, REG_ITMP3);
-                       M_IADD_IMM(s2, OFFSET(java_bytearray, data[0]), REG_ITMP2);
-                       M_STBX(s3, s1, REG_ITMP2);
-                       break;
+                       }
+                       s3 = emit_load_s3(jd, iptr, src, rd->argintregs[1]);
 
-               case ICMD_SASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       disp = dseg_add_functionptr(cd, BUILTIN_canstore);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_MTCTR(REG_ITMP3);
 
-                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src->prev, REG_ITMP2);
-                       if (iptr->op1 == 0) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                               }
-                       var_to_reg_int(s3, src, REG_ITMP3);
-                       M_SLL_IMM(s2, 1, REG_ITMP2);
-                       M_IADD_IMM(REG_ITMP2, OFFSET(java_shortarray, data[0]), REG_ITMP2);
-                       M_STHX(s3, s1, REG_ITMP2);
-                       break;
+                       M_INTMOVE(s1, rd->argintregs[0]);
+                       M_INTMOVE(s3, rd->argintregs[1]);
 
-               case ICMD_CASTORE:    /* ..., arrayref, index, value  ==> ...         */
+                       M_JSR;
+                       M_TST(REG_RESULT);
+                       M_BEQ(0);
+                       codegen_add_arraystoreexception_ref(cd);
 
-                       var_to_reg_int(s1, src->prev->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src->prev, REG_ITMP2);
-                       if (iptr->op1 == 0) {
-                               gen_nullptr_check(s1);
-                               gen_bound_check;
-                               }
-                       var_to_reg_int(s3, src, REG_ITMP3);
-                       M_SLL_IMM(s2, 1, REG_ITMP2);
-                       M_IADD_IMM(REG_ITMP2, OFFSET(java_chararray, data[0]), REG_ITMP2);
-                       M_STHX(s3, s1, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src->prev, REG_ITMP2);
+                       s3 = emit_load_s3(jd, iptr, src, REG_ITMP3);
+                       M_SLL_IMM(s2, 2, REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP2, OFFSET(java_objectarray, data[0]), REG_ITMP2);
+                       M_STWX(s3, s1, REG_ITMP2);
                        break;
 
-               case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
+
+               case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
                                      /* op1 = type, val.a = field address            */
 
-                       /* if class isn't yet initialized, do it */
-                       if (!((fieldinfo *) iptr->val.a)->class->initialized) {
-                               /* call helper function which patches this code */
-                               a = dseg_addaddress(cd, ((fieldinfo *) iptr->val.a)->class);
-                               M_ALD(REG_ITMP1, REG_PV, a);
-                               a = dseg_addaddress(cd, asm_check_clinit);
-                               M_ALD(REG_PV, REG_PV, a);
-                               M_MTCTR(REG_PV);
-                               M_JSR;
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
 
-                               /* recompute pv */
-                               s1 = (s4) ((u1 *) mcodeptr - cd->mcodebase);
-                               M_MFLR(REG_ITMP1);
-                               if (s1 <= 32768) M_LDA(REG_PV, REG_ITMP1, -s1);
-                               else {
-                                       s4 ml = -s1, mh = 0;
-                                       while (ml < -32768) { ml += 65536; mh--; }
-                                       M_LDA(REG_PV, REG_ITMP1, ml);
-                                       M_LDAH(REG_PV, REG_PV, mh);
-                               }
+                               disp = dseg_add_unique_address(cd, uf);
+
+                               codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
                        }
+                       else {
+                               fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
 
-                       a = dseg_addaddress(cd, &(((fieldinfo *) iptr->val.a)->value));
-                       M_ALD(REG_ITMP1, REG_PV, a);
-                       switch (iptr->op1) {
-                               case TYPE_INT:
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       M_IST(s2, REG_ITMP1, 0);
-                                       break;
-                               case TYPE_LNG:
-                                       var_to_reg_int(s2, src, REG_ITMP3);
-                                       M_IST(s2, REG_ITMP1, 0);
-                                       M_IST(rd->secondregs[s2], REG_ITMP1, 4);
-                                       break;
-                               case TYPE_ADR:
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       M_AST(s2, REG_ITMP1, 0);
-                                       break;
-                               case TYPE_FLT:
-                                       var_to_reg_flt(s2, src, REG_FTMP2);
-                                       M_FST(s2, REG_ITMP1, 0);
-                                       break;
-                               case TYPE_DBL:
-                                       var_to_reg_flt(s2, src, REG_FTMP2);
-                                       M_DST(s2, REG_ITMP1, 0);
-                                       break;
-                               default: panic ("internal error");
+                               disp = dseg_add_address(cd, &(fi->value));
+
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, PATCHER_initialize_class,
+                                                                               fi->class, disp);
+
+                                       if (opt_showdisassemble)
+                                               M_NOP;
                                }
+                       }
+
+                       M_ALD(REG_ITMP1, REG_PV, disp);
+                       switch (iptr->op1) {
+                       case TYPE_INT:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                               M_ILD_INTERN(d, REG_ITMP1, 0);
+                               break;
+                       case TYPE_LNG:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                               M_ILD_INTERN(GET_LOW_REG(d), REG_ITMP1, 4);/* keep this order */
+                               M_ILD_INTERN(GET_HIGH_REG(d), REG_ITMP1, 0);/*keep this order */
+                               break;
+                       case TYPE_ADR:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                               M_ALD_INTERN(d, REG_ITMP1, 0);
+                               break;
+                       case TYPE_FLT:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+                               M_FLD_INTERN(d, REG_ITMP1, 0);
+                               break;
+                       case TYPE_DBL:                          
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+                               M_DLD_INTERN(d, REG_ITMP1, 0);
+                               break;
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-               case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
+               case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
                                      /* op1 = type, val.a = field address            */
 
-            /* if class isn't yet initialized, do it */
-            if (!((fieldinfo *) iptr->val.a)->class->initialized) {
-                /* call helper function which patches this code */
-                a = dseg_addaddress(cd, ((fieldinfo *) iptr->val.a)->class);
-                M_ALD(REG_ITMP1, REG_PV, a);
-                a = dseg_addaddress(cd, asm_check_clinit);
-                M_ALD(REG_PV, REG_PV, a);
-                M_MTCTR(REG_PV);
-                M_JSR;
-
-                /* recompute pv */
-                s1 = (s4) ((u1 *) mcodeptr - cd->mcodebase);
-                M_MFLR(REG_ITMP1);
-                if (s1 <= 32768) M_LDA(REG_PV, REG_ITMP1, -s1);
-                else {
-                    s4 ml = -s1, mh = 0;
-                    while (ml < -32768) { ml += 65536; mh--; }
-                    M_LDA(REG_PV, REG_ITMP1, ml);
-                    M_LDAH(REG_PV, REG_PV, mh);
-                }
-            }
-
-                       a = dseg_addaddress(cd, &(((fieldinfo *) iptr->val.a)->value));
-                       M_ALD(REG_ITMP1, REG_PV, a);
-                       switch (iptr->op1) {
-                               case TYPE_INT:
-                                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                                       M_ILD(d, REG_ITMP1, 0);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_LNG:
-                                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                                       M_ILD(d, REG_ITMP1, 0);
-                                       M_ILD(rd->secondregs[d], REG_ITMP1, 4);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_ADR:
-                                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                                       M_ALD(d, REG_ITMP1, 0);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_FLT:
-                                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
-                                       M_FLD(d, REG_ITMP1, 0);
-                                       store_reg_to_var_flt(iptr->dst, d);
-                                       break;
-                               case TYPE_DBL:                          
-                                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
-                                       M_DLD(d, REG_ITMP1, 0);
-                                       store_reg_to_var_flt(iptr->dst, d);
-                                       break;
-                               default: panic ("internal error");
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+                               disp = dseg_add_unique_address(cd, uf);
+
+                               codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
+                       }
+                       else {
+                               fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
+
+                               disp = dseg_add_address(cd, &(fi->value));
+
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                                       codegen_addpatchref(cd, PATCHER_initialize_class,
+                                                                               fi->class, disp);
+
+                                       if (opt_showdisassemble)
+                                               M_NOP;
                                }
+                       }
+
+                       M_ALD(REG_ITMP1, REG_PV, disp);
+                       switch (iptr->op1) {
+                       case TYPE_INT:
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+                               M_IST_INTERN(s1, REG_ITMP1, 0);
+                               break;
+                       case TYPE_LNG:
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP23_PACKED);
+                               M_LST_INTERN(s1, REG_ITMP1, 0);
+                               break;
+                       case TYPE_ADR:
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+                               M_AST_INTERN(s1, REG_ITMP1, 0);
+                               break;
+                       case TYPE_FLT:
+                               s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+                               M_FST_INTERN(s1, REG_ITMP1, 0);
+                               break;
+                       case TYPE_DBL:
+                               s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+                               M_DST_INTERN(s1, REG_ITMP1, 0);
+                               break;
+                       }
                        break;
 
 
-               case ICMD_PUTFIELD:   /* ..., value  ==> ...                          */
+               case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
                                      /* op1 = type, val.i = field offset             */
 
-                       a = ((fieldinfo *)(iptr->val.a))->offset;
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       gen_nullptr_check(s1);
+
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+                               codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
+
+                               disp = 0;
+                       }
+                       else {
+                               fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
+                               disp = fi->offset;
+                       }
+
                        switch (iptr->op1) {
-                               case TYPE_INT:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       gen_nullptr_check(s1);
-                                       M_IST(s2, s1, a);
-                                       break;
-                               case TYPE_LNG:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_int(s2, src, REG_ITMP3);
-                                       gen_nullptr_check(s1);
-                                       M_IST(s2, s1, a);
-                                       M_IST(rd->secondregs[s2], s1, a+4);
-                                       break;
-                               case TYPE_ADR:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_int(s2, src, REG_ITMP2);
-                                       gen_nullptr_check(s1);
-                                       M_AST(s2, s1, a);
-                                       break;
-                               case TYPE_FLT:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_flt(s2, src, REG_FTMP2);
-                                       gen_nullptr_check(s1);
-                                       M_FST(s2, s1, a);
-                                       break;
-                               case TYPE_DBL:
-                                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                                       var_to_reg_flt(s2, src, REG_FTMP2);
-                                       gen_nullptr_check(s1);
-                                       M_DST(s2, s1, a);
-                                       break;
-                               default: panic ("internal error");
+                       case TYPE_INT:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                               M_ILD(d, s1, disp);
+                               break;
+                       case TYPE_LNG:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP12_PACKED);
+                               if (GET_HIGH_REG(d) == s1) {
+                                       M_ILD(GET_LOW_REG(d), s1, disp + 4);
+                                       M_ILD(GET_HIGH_REG(d), s1, disp);
+                               }
+                               else {
+                                       M_ILD(GET_HIGH_REG(d), s1, disp);
+                                       M_ILD(GET_LOW_REG(d), s1, disp + 4);
                                }
+                               break;
+                       case TYPE_ADR:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                               M_ALD(d, s1, disp);
+                               break;
+                       case TYPE_FLT:
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+                               M_FLD(d, s1, disp);
+                               break;
+                       case TYPE_DBL:                          
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
+                               M_DLD(d, s1, disp);
+                               break;
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
                        break;
 
-               case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
+               case ICMD_PUTFIELD:   /* ..., value  ==> ...                          */
                                      /* op1 = type, val.i = field offset             */
 
-                       a = ((fieldinfo *)(iptr->val.a))->offset;
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       gen_nullptr_check(s1);
+
+                       if (!IS_FLT_DBL_TYPE(iptr->op1)) {
+                               if (IS_2_WORD_TYPE(iptr->op1))
+                                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP23_PACKED);
+                               else
+                                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       }
+                       else
+                               s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
+
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+                               codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
+
+                               disp = 0;
+                       }
+                       else {
+                               fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
+                               disp = fi->offset;
+                       }
+
                        switch (iptr->op1) {
-                               case TYPE_INT:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                                       gen_nullptr_check(s1);
-                                       M_ILD(d, s1, a);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_LNG:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                                       gen_nullptr_check(s1);
-                                       M_ILD(d, s1, a);
-                                       M_ILD(rd->secondregs[d], s1, a+4);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_ADR:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                                       gen_nullptr_check(s1);
-                                       M_ALD(d, s1, a);
-                                       store_reg_to_var_int(iptr->dst, d);
-                                       break;
-                               case TYPE_FLT:
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
-                                       gen_nullptr_check(s1);
-                                       M_FLD(d, s1, a);
-                                       store_reg_to_var_flt(iptr->dst, d);
-                                       break;
-                               case TYPE_DBL:                          
-                                       var_to_reg_int(s1, src, REG_ITMP1);
-                                       d = reg_of_var(rd, iptr->dst, REG_FTMP1);
-                                       gen_nullptr_check(s1);
-                                       M_DLD(d, s1, a);
-                                       store_reg_to_var_flt(iptr->dst, d);
-                                       break;
-                               default: panic ("internal error");
-                               }
+                       case TYPE_INT:
+                               M_IST(s2, s1, disp);
+                               break;
+                       case TYPE_LNG:
+                               M_IST(GET_LOW_REG(s2), s1, disp + 4);      /* keep this order */
+                               M_IST(GET_HIGH_REG(s2), s1, disp);         /* keep this order */
+                               break;
+                       case TYPE_ADR:
+                               M_AST(s2, s1, disp);
+                               break;
+                       case TYPE_FLT:
+                               M_FST(s2, s1, disp);
+                               break;
+                       case TYPE_DBL:
+                               M_DST(s2, s1, disp);
+                               break;
+                       }
                        break;
 
 
@@ -2022,38 +2153,59 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                case ICMD_ATHROW:       /* ..., objectref ==> ... (, objectref)       */
 
-                       a = dseg_addaddress(cd, asm_handle_exception);
-                       M_ALD(REG_ITMP2, REG_PV, a);
-                       M_MTCTR(REG_ITMP2);
-                       var_to_reg_int(s1, src, REG_ITMP1);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
                        M_INTMOVE(s1, REG_ITMP1_XPTR);
 
-                       if (m->isleafmethod) M_MFLR(REG_ITMP3);  /* save LR */
-                       M_BL(0);            /* get current PC */
+#ifdef ENABLE_VERIFIER
+                       if (iptr->val.a) {
+                               unresolved_class *uc = INSTRUCTION_UNRESOLVED_CLASS(iptr);
+
+                               codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
+                       }
+#endif /* ENABLE_VERIFIER */
+
+                       disp = dseg_add_functionptr(cd, asm_handle_exception);
+                       M_ALD(REG_ITMP2, REG_PV, disp);
+                       M_MTCTR(REG_ITMP2);
+
+                       if (jd->isleafmethod)
+                               M_MFLR(REG_ITMP3);                          /* save LR        */
+
+                       M_BL(0);                                        /* get current PC */
                        M_MFLR(REG_ITMP2_XPC);
-                       if (m->isleafmethod) M_MTLR(REG_ITMP3);  /* restore LR */
-                       M_RTS;              /* jump to CTR */
 
+                       if (jd->isleafmethod)
+                               M_MTLR(REG_ITMP3);                          /* restore LR     */
+
+                       M_RTS;                                          /* jump to CTR    */
                        ALIGNCODENOP;
                        break;
 
                case ICMD_GOTO:         /* ... ==> ...                                */
                                        /* op1 = target JavaVM pc                     */
                        M_BR(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        ALIGNCODENOP;
                        break;
 
                case ICMD_JSR:          /* ... ==> ...                                */
                                        /* op1 = target JavaVM pc                     */
 
-                       if (m->isleafmethod) M_MFLR(REG_ITMP2);
+                       if (jd->isleafmethod)
+                               M_MFLR(REG_ITMP2);
+
                        M_BL(0);
                        M_MFLR(REG_ITMP1);
-                       M_IADD_IMM(REG_ITMP1, m->isleafmethod ? 16 : 12, REG_ITMP1);
-                       if (m->isleafmethod) M_MTLR(REG_ITMP2);
+                       M_IADD_IMM(REG_ITMP1, jd->isleafmethod ? 4*4 : 3*4, REG_ITMP1);
+
+                       if (jd->isleafmethod)
+                               M_MTLR(REG_ITMP2);
+
                        M_BR(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
                        
                case ICMD_RET:          /* ... ==> ...                                */
@@ -2061,11 +2213,11 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                        var = &(rd->locals[iptr->op1][TYPE_ADR]);
                        if (var->flags & INMEMORY) {
-                               M_ALD(REG_ITMP1, REG_SP, 4 * var->regoff);
+                               M_ALD(REG_ITMP1, REG_SP, var->regoff * 4);
                                M_MTCTR(REG_ITMP1);
-                               }
-                       else
+                       } else {
                                M_MTCTR(var->regoff);
+                       }
                        M_RTS;
                        ALIGNCODENOP;
                        break;
@@ -2073,19 +2225,19 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
                case ICMD_IFNULL:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
                        M_TST(s1);
                        M_BEQ(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IFNONNULL:    /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
                        M_TST(s1);
                        M_BNE(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IFLT:
@@ -2096,370 +2248,469 @@ void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
                case ICMD_IFEQ:         /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.i = constant   */
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767))
                                M_CMPI(s1, iptr->val.i);
-                               }
                        else {
                                ICONST(REG_ITMP2, iptr->val.i);
                                M_CMP(s1, REG_ITMP2);
-                               }
-                       switch (iptr->opc)
-                       {
-                               case ICMD_IFLT:
-                                       M_BLT(0);
-                                       break;
-                               case ICMD_IFLE:
-                                       M_BLE(0);
-                                       break;
-                               case ICMD_IFNE:
-                                       M_BNE(0);
-                                       break;
-                               case ICMD_IFGT:
-                                       M_BGT(0);
-                                       break;
-                               case ICMD_IFGE:
-                                       M_BGE(0);
-                                       break;
-                               case ICMD_IFEQ:
-                                       M_BEQ(0);
-                                       break;
-                               }
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       }
+                       switch (iptr->opc) {
+                       case ICMD_IFLT:
+                               M_BLT(0);
+                               break;
+                       case ICMD_IFLE:
+                               M_BLE(0);
+                               break;
+                       case ICMD_IFNE:
+                               M_BNE(0);
+                               break;
+                       case ICMD_IFGT:
+                               M_BGT(0);
+                               break;
+                       case ICMD_IFGE:
+                               M_BGE(0);
+                               break;
+                       case ICMD_IFEQ:
+                               M_BEQ(0);
+                               break;
+                       }
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
 
                case ICMD_IF_LEQ:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
 
-            var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 1, 0);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
                        if (iptr->val.l == 0) {
-                               M_OR(s1, s2, REG_ITMP3);
-                               M_CMPI(REG_ITMP3, 0);
-
-                       } else if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
-                               M_CMPI(s2, (u4) (iptr->val.l >> 32));
-                               M_BNE(2);
-                               M_CMPI(s1, (u4) (iptr->val.l & 0xffffffff));
-
+                               M_OR_TST(s1, s2, REG_ITMP3);
+                       } else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
+                               M_XOR_IMM(s2, 0, REG_ITMP2);
+                               M_XOR_IMM(s1, iptr->val.l & 0xffff, REG_ITMP1);
+                               M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
                        } else {
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l >> 32));
-                               M_CMP(s2, REG_ITMP3);
-                               M_BNE(3);
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l & 0xffffffff));
-                               M_CMP(s1, REG_ITMP3)
+                               ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
+                               M_XOR(s1, REG_ITMP3, REG_ITMP1);
+                               ICONST(REG_ITMP3, iptr->val.l >> 32);
+                               M_XOR(s2, REG_ITMP3, REG_ITMP2);
+                               M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
                        }
                        M_BEQ(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
                        
                case ICMD_IF_LLT:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
-            var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 1, 0);
-/*                     if (iptr->val.l == 0) { */
-/*                             M_OR(s1, s2, REG_ITMP3); */
-/*                             M_CMPI(REG_ITMP3, 0); */
-
-/*                     } else  */
-                       if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
-                               M_CMPI(s2, (u4) (iptr->val.l >> 32));
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       if (iptr->val.l == 0) {
+                               /* if high word is less than zero, the whole long is too */
+                               M_CMPI(s2, 0);
+                       } else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
+                               M_CMPI(s2, 0);
                                M_BLT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BGT(2);
-                               M_CMPI(s1, (u4) (iptr->val.l & 0xffffffff));
-
+                               M_CMPUI(s1, iptr->val.l & 0xffff);
                        } else {
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l >> 32));
+                               ICONST(REG_ITMP3, iptr->val.l >> 32);
                                M_CMP(s2, REG_ITMP3);
                                M_BLT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BGT(3);
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l & 0xffffffff));
-                               M_CMP(s1, REG_ITMP3)
+                               ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
+                               M_CMPU(s1, REG_ITMP3);
                        }
                        M_BLT(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
                        
                case ICMD_IF_LLE:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
 
-            var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 1, 0);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
 /*                     if (iptr->val.l == 0) { */
 /*                             M_OR(s1, s2, REG_ITMP3); */
 /*                             M_CMPI(REG_ITMP3, 0); */
 
 /*                     } else  */
-                       if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
-                               M_CMPI(s2, (u4) (iptr->val.l >> 32));
+                       if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
+                               M_CMPI(s2, 0);
                                M_BLT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BGT(2);
-                               M_CMPI(s1, (u4) (iptr->val.l & 0xffffffff));
-
+                               M_CMPUI(s1, iptr->val.l & 0xffff);
                        } else {
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l >> 32));
+                               ICONST(REG_ITMP3, iptr->val.l >> 32);
                                M_CMP(s2, REG_ITMP3);
                                M_BLT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BGT(3);
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l & 0xffffffff));
-                               M_CMP(s1, REG_ITMP3)
+                               ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
+                               M_CMPU(s1, REG_ITMP3);
                        }
                        M_BLE(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
                        
                case ICMD_IF_LNE:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
 
-            var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 1, 0);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
                        if (iptr->val.l == 0) {
-                               M_OR(s1, s2, REG_ITMP3);
-                               M_CMPI(REG_ITMP3, 0);
-
-                       } else if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
-                               M_CMPI(s2, (u4) (iptr->val.l >> 32));
-                               M_BEQ(2);
-                               M_CMPI(s1, (u4) (iptr->val.l & 0xffffffff));
-
+                               M_OR_TST(s1, s2, REG_ITMP3);
+                       } else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
+                               M_XOR_IMM(s2, 0, REG_ITMP2);
+                               M_XOR_IMM(s1, iptr->val.l & 0xffff, REG_ITMP1);
+                               M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
                        } else {
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l >> 32));
-                               M_CMP(s2, REG_ITMP3);
-                               M_BEQ(3);
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l & 0xffffffff));
-                               M_CMP(s1, REG_ITMP3)
+                               ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
+                               M_XOR(s1, REG_ITMP3, REG_ITMP1);
+                               ICONST(REG_ITMP3, iptr->val.l >> 32);
+                               M_XOR(s2, REG_ITMP3, REG_ITMP2);
+                               M_OR_TST(REG_ITMP1, REG_ITMP2, REG_ITMP3);
                        }
                        M_BNE(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
                        
                case ICMD_IF_LGT:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
 
-            var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 1, 0);
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
 /*                     if (iptr->val.l == 0) { */
 /*                             M_OR(s1, s2, REG_ITMP3); */
 /*                             M_CMPI(REG_ITMP3, 0); */
 
 /*                     } else  */
-                       if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
-                               M_CMPI(s2, (u4) (iptr->val.l >> 32));
+                       if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
+                               M_CMPI(s2, 0);
                                M_BGT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BLT(2);
-                               M_CMPI(s1, (u4) (iptr->val.l & 0xffffffff));
-
+                               M_CMPUI(s1, iptr->val.l & 0xffff);
                        } else {
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l >> 32));
+                               ICONST(REG_ITMP3, iptr->val.l >> 32);
                                M_CMP(s2, REG_ITMP3);
                                M_BGT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BLT(3);
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l & 0xffffffff));
-                               M_CMP(s1, REG_ITMP3)
+                               ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
+                               M_CMPU(s1, REG_ITMP3);
                        }
                        M_BGT(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
                        
                case ICMD_IF_LGE:       /* ..., value ==> ...                         */
                                        /* op1 = target JavaVM pc, val.l = constant   */
-            var_to_reg_int0(s1, src, REG_ITMP1, 0, 1);
-            var_to_reg_int0(s2, src, REG_ITMP2, 1, 0);
-/*                     if (iptr->val.l == 0) { */
-/*                             M_OR(s1, s2, REG_ITMP3); */
-/*                             M_CMPI(REG_ITMP3, 0); */
 
-/*                     } else  */
-                       if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
-                               M_CMPI(s2, (u4) (iptr->val.l >> 32));
+                       s1 = emit_load_s1_low(jd, iptr, src, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       if (iptr->val.l == 0) {
+                               /* if high word is greater equal zero, the whole long is too */
+                               M_CMPI(s2, 0);
+                       } else if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
+                               M_CMPI(s2, 0);
                                M_BGT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BLT(2);
-                               M_CMPI(s1, (u4) (iptr->val.l & 0xffffffff));
-
+                               M_CMPUI(s1, iptr->val.l & 0xffff);
                        } else {
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l >> 32));
+                               ICONST(REG_ITMP3, iptr->val.l >> 32);
                                M_CMP(s2, REG_ITMP3);
                                M_BGT(0);
-                               codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                               codegen_addreference(cd, (basicblock *) iptr->target);
                                M_BLT(3);
-                               ICONST(REG_ITMP3, (u4) (iptr->val.l & 0xffffffff));
-                               M_CMP(s1, REG_ITMP3)
+                               ICONST(REG_ITMP3, iptr->val.l & 0xffffffff);
+                               M_CMPU(s1, REG_ITMP3);
                        }
                        M_BGE(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
-                       /* CUT: alle _L */
                case ICMD_IF_ICMPEQ:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_LCMPEQ:    /* op1 = target JavaVM pc                     */
-               case ICMD_IF_ACMPEQ:
+               case ICMD_IF_ACMPEQ:    /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
                        M_CMP(s1, s2);
                        M_BEQ(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_LCMPEQ:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       /* load low-bits before the branch, so we know the distance */
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       M_BNE(2);
+                       M_CMP(s1, s2);
+                       M_BEQ(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IF_ICMPNE:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_LCMPNE:    /* op1 = target JavaVM pc                     */
-               case ICMD_IF_ACMPNE:
+               case ICMD_IF_ACMPNE:    /* op1 = target JavaVM pc                     */
+
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_BNE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_LCMPNE:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_BNE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
                        M_CMP(s1, s2);
                        M_BNE(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IF_ICMPLT:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_LCMPLT:    /* op1 = target JavaVM pc                     */
+                                       /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
                        M_CMP(s1, s2);
                        M_BLT(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_LCMPLT:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_BLT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       /* load low-bits before the branch, so we know the distance */
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       M_BGT(2);
+                       M_CMPU(s1, s2);
+                       M_BLT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IF_ICMPGT:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_LCMPGT:    /* op1 = target JavaVM pc                     */
+                                       /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
                        M_CMP(s1, s2);
                        M_BGT(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_LCMPGT:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_BGT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       /* load low-bits before the branch, so we know the distance */  
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       M_BLT(2);
+                       M_CMPU(s1, s2);
+                       M_BGT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IF_ICMPLE:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_LCMPLE:    /* op1 = target JavaVM pc                     */
+                                       /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
                        M_CMP(s1, s2);
                        M_BLE(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_LCMPLE:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_BLT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       /* load low-bits before the branch, so we know the distance */
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       M_BGT(2);
+                       M_CMPU(s1, s2);
+                       M_BLE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IF_ICMPGE:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_LCMPGE:    /* op1 = target JavaVM pc                     */
+                                       /* op1 = target JavaVM pc                     */
 
-                       var_to_reg_int(s1, src->prev, REG_ITMP1);
-                       var_to_reg_int(s2, src, REG_ITMP2);
+                       s1 = emit_load_s1(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
                        M_CMP(s1, s2);
                        M_BGE(0);
-                       codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       break;
+
+               case ICMD_IF_LCMPGE:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       s1 = emit_load_s1_high(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, src, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_BGT(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
+                       /* load low-bits before the branch, so we know the distance */
+                       s1 = emit_load_s1_low(jd, iptr, src->prev, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, src, REG_ITMP2);
+                       M_BLT(2);
+                       M_CMPU(s1, s2);
+                       M_BGE(0);
+                       codegen_addreference(cd, (basicblock *) iptr->target);
                        break;
 
                case ICMD_IRETURN:      /* ..., retvalue ==> ...                      */
-               case ICMD_LRETURN:
-               case ICMD_ARETURN:
 
-               case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
-               case ICMD_DRETURN:
+                       s1 = emit_load_s1(jd, iptr, src, REG_RESULT);
+                       M_INTMOVE(s1, REG_RESULT);
+                       goto nowperformreturn;
 
-               case ICMD_RETURN:      /* ...  ==> ...                                */
+               case ICMD_ARETURN:      /* ..., retvalue ==> ...                      */
 
-#if defined(USE_THREADS)
-                       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
-                               a = dseg_addaddress(cd, (void *) (builtin_monitorexit));
-                               M_ALD(REG_ITMP3, REG_PV, a);
-                               M_MTCTR(REG_ITMP3);
-                               M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 4);
-                               M_JSR;
-                       }
-#endif
-                       switch (iptr->opc) {
-                       case ICMD_IRETURN:
-                       case ICMD_LRETURN:
-                       case ICMD_ARETURN:
-                               var_to_reg_int(s1, src, REG_RESULT);
-                               M_TINTMOVE(src->type, s1, REG_RESULT);
-                               goto nowperformreturn;
+                       s1 = emit_load_s1(jd, iptr, src, REG_RESULT);
+                       M_INTMOVE(s1, REG_RESULT);
 
-                       case ICMD_FRETURN:
-                       case ICMD_DRETURN:
-                               var_to_reg_flt(s1, src, REG_FRESULT);
-                               M_FLTMOVE(s1, REG_FRESULT);
-                               goto nowperformreturn;
+#ifdef ENABLE_VERIFIER
+                       if (iptr->val.a) {
+                               unresolved_class *uc = INSTRUCTION_UNRESOLVED_CLASS(iptr);
+
+                               codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
                        }
+#endif /* ENABLE_VERIFIER */
+                       goto nowperformreturn;
+
+               case ICMD_LRETURN:      /* ..., retvalue ==> ...                      */
+
+                       s1 = emit_load_s1(jd, iptr, src, REG_RESULT_PACKED);
+                       M_LNGMOVE(s1, REG_RESULT_PACKED);
+                       goto nowperformreturn;
+
+               case ICMD_FRETURN:      /* ..., retvalue ==> ...                      */
+               case ICMD_DRETURN:
+
+                       s1 = emit_load_s1(jd, iptr, src, REG_FRESULT);
+                       M_FLTMOVE(s1, REG_FRESULT);
+                       goto nowperformreturn;
+
+               case ICMD_RETURN:      /* ...  ==> ...                                */
 
 nowperformreturn:
                        {
                        s4 i, p;
                        
-                       p = parentargs_base;
-                       
-                       /* restore return address                                         */
+                       p = cd->stackframesize;
 
-                       if (!m->isleafmethod) {
-                               M_ALD(REG_ITMP3, REG_SP, 4 * p + 8);
-                               M_MTLR(REG_ITMP3);
-                       }
+                       /* call trace function */
 
-                       /* restore saved registers                                        */
+                       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+                               emit_verbosecall_exit(jd);
 
-                       for (i = rd->savintregcnt - 1; i >= rd->maxsavintreguse; i--) {
-                               p--; M_ILD(rd->savintregs[i], REG_SP, 4 * p);
-                       }
-                       for (i = rd->savfltregcnt - 1; i >= rd->maxsavfltreguse; i--) {
-                               p -= 2; M_DLD(rd->savfltregs[i], REG_SP, 4 * p);
-                       }
+#if defined(ENABLE_THREADS)
+                       if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+                               disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
+                               M_ALD(REG_ITMP3, REG_PV, disp);
+                               M_MTCTR(REG_ITMP3);
 
-                       /* deallocate stack                                               */
+                               /* we need to save the proper return value */
 
-                       if (parentargs_base) {
-                               M_LDA(REG_SP, REG_SP, parentargs_base*4);
-                       }
+                               switch (iptr->opc) {
+                               case ICMD_LRETURN:
+                                       M_IST(REG_RESULT2, REG_SP, rd->memuse * 4 + 8);
+                                       /* fall through */
+                               case ICMD_IRETURN:
+                               case ICMD_ARETURN:
+                                       M_IST(REG_RESULT , REG_SP, rd->memuse * 4 + 4);
+                                       break;
+                               case ICMD_FRETURN:
+                                       M_FST(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+                                       break;
+                               case ICMD_DRETURN:
+                                       M_DST(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+                                       break;
+                               }
 
-                       /* call trace function */
+                               M_ALD(rd->argintregs[0], REG_SP, rd->memuse * 4);
+                               M_JSR;
 
-                       if (runverbose) {
-                               M_MFLR(REG_ITMP3);
-                               M_LDA(REG_SP, REG_SP, -10 * 8);
-                               M_DST(REG_FRESULT, REG_SP, 48+0);
-                               M_IST(REG_RESULT, REG_SP, 48+8);
-                               M_AST(REG_ITMP3, REG_SP, 48+12);
-                               M_IST(REG_RESULT2, REG_SP, 48+16);
-                               a = dseg_addaddress(cd, m);
+                               /* and now restore the proper return value */
 
-                               /* keep this order */
                                switch (iptr->opc) {
+                               case ICMD_LRETURN:
+                                       M_ILD(REG_RESULT2, REG_SP, rd->memuse * 4 + 8);
+                                       /* fall through */
                                case ICMD_IRETURN:
                                case ICMD_ARETURN:
-                                       M_MOV(REG_RESULT, rd->argintregs[2]);
-                                       M_CLR(rd->argintregs[1]);
+                                       M_ILD(REG_RESULT , REG_SP, rd->memuse * 4 + 4);
                                        break;
-
-                               case ICMD_LRETURN:
-                                       M_MOV(REG_RESULT2, rd->argintregs[2]);
-                                       M_MOV(REG_RESULT, rd->argintregs[1]);
+                               case ICMD_FRETURN:
+                                       M_FLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
+                                       break;
+                               case ICMD_DRETURN:
+                                       M_DLD(REG_FRESULT, REG_SP, rd->memuse * 4 + 4);
                                        break;
                                }
-                               M_ALD(rd->argintregs[0], REG_PV, a);
+                       }
+#endif
 
-                               M_FLTMOVE(REG_FRESULT, rd->argfltregs[0]);
-                               M_FLTMOVE(REG_FRESULT, rd->argfltregs[1]);
-                               a = dseg_addaddress(cd, (void *) builtin_displaymethodstop);
-                               M_ALD(REG_ITMP2, REG_PV, a);
-                               M_MTCTR(REG_ITMP2);
-                               M_JSR;
-                               M_DLD(REG_FRESULT, REG_SP, 48+0);
-                               M_ILD(REG_RESULT, REG_SP, 48+8);
-                               M_ALD(REG_ITMP3, REG_SP, 48+12);
-                               M_ILD(REG_RESULT2, REG_SP, 48+16);
-                               M_LDA(REG_SP, REG_SP, 10 * 8);
-                               M_MTLR(REG_ITMP3);
+                       /* restore return address                                         */
+
+                       if (!jd->isleafmethod) {
+                               /* ATTENTION: Don't use REG_ZERO (r0) here, as M_ALD
+                                  may have a displacement overflow. */
+
+                               M_ALD(REG_ITMP1, REG_SP, p * 4 + LA_LR_OFFSET);
+                               M_MTLR(REG_ITMP1);
+                       }
+
+                       /* restore saved registers                                        */
+
+                       for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
+                               p--; M_ILD(rd->savintregs[i], REG_SP, p * 4);
                        }
+                       for (i = FLT_SAV_CNT - 1; i >= rd->savfltreguse; i--) {
+                               p -= 2; M_DLD(rd->savfltregs[i], REG_SP, p * 4);
+                       }
+
+                       /* deallocate stack                                               */
+
+                       if (cd->stackframesize)
+                               M_LDA(REG_SP, REG_SP, cd->stackframesize * 4);
 
                        M_RET;
                        ALIGNCODENOP;
@@ -2478,7 +2729,7 @@ nowperformreturn:
                        l = s4ptr[1];                          /* low     */
                        i = s4ptr[2];                          /* high    */
                        
-                       var_to_reg_int(s1, src, REG_ITMP1);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
                        if (l == 0) {
                                M_INTMOVE(s1, REG_ITMP1);
                        } else if (l <= 32768) {
@@ -2493,9 +2744,7 @@ nowperformreturn:
 
                        M_CMPUI(REG_ITMP1, i - 1);
                        M_BGT(0);
-
-                       /* codegen_addreference(cd, BlockPtrOfPC(s4ptr[0]), mcodeptr); */
-                       codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+                       codegen_addreference(cd, (basicblock *) tptr[0]);
 
                        /* build jump table top down and use address of lowest entry */
 
@@ -2503,13 +2752,12 @@ nowperformreturn:
                        tptr += i;
 
                        while (--i >= 0) {
-                               /* dseg_addtarget(cd, BlockPtrOfPC(*--s4ptr)); */
-                               dseg_addtarget(cd, (basicblock *) tptr[0]); 
+                               dseg_add_target(cd, (basicblock *) tptr[0]); 
                                --tptr;
-                               }
+                       }
                        }
 
-                       /* length of dataseg after last dseg_addtarget is used by load */
+                       /* length of dataseg after last dseg_add_target is used by load */
 
                        M_SLL_IMM(REG_ITMP1, 2, REG_ITMP1);
                        M_IADD(REG_ITMP1, REG_PV, REG_ITMP2);
@@ -2532,7 +2780,7 @@ nowperformreturn:
                        i = s4ptr[1];                          /* count    */
                        
                        MCODECHECK((i<<2)+8);
-                       var_to_reg_int(s1, src, REG_ITMP1);
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
                        while (--i >= 0) {
                                s4ptr += 2;
                                ++tptr;
@@ -2540,390 +2788,584 @@ nowperformreturn:
                                val = s4ptr[0];
                                if ((val >= -32768) && (val <= 32767)) {
                                        M_CMPI(s1, val);
-                                       } 
+                               }
                                else {
-                                       a = dseg_adds4(cd, val);
+                                       a = dseg_add_s4(cd, val);
                                        M_ILD(REG_ITMP2, REG_PV, a);
                                        M_CMP(s1, REG_ITMP2);
-                                       }
-                               M_BEQ(0);
-                               /* codegen_addreference(cd, BlockPtrOfPC(s4ptr[1]), mcodeptr); */
-                               codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr); 
                                }
+                               M_BEQ(0);
+                               codegen_addreference(cd, (basicblock *) tptr[0]); 
+                       }
 
                        M_BR(0);
-                       /* codegen_addreference(cd, BlockPtrOfPC(l), mcodeptr); */
-                       
                        tptr = (void **) iptr->target;
-                       codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
+                       codegen_addreference(cd, (basicblock *) tptr[0]);
 
                        ALIGNCODENOP;
                        break;
                        }
 
 
-               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_BUILTIN:      /* ..., [arg1, [arg2 ...]] ==> ...            */
+                                       /* op1 = arg count val.a = builtintable entry */
 
-               case ICMD_BUILTIN1:     /* ..., arg1 ==> ...                          */
-                                       /* op1 = return type, val.a = function pointer*/
-                       s3 = 1;
+                       bte = iptr->val.a;
+                       md = bte->md;
                        goto gen_method;
 
                case ICMD_INVOKESTATIC: /* ..., [arg1, [arg2 ...]] ==> ...            */
                                        /* op1 = arg count, val.a = method pointer    */
 
                case ICMD_INVOKESPECIAL:/* ..., objectref, [arg1, [arg2 ...]] ==> ... */
-                                       /* op1 = arg count, val.a = method pointer    */
-
-               case ICMD_INVOKEVIRTUAL:/* ..., objectref, [arg1, [arg2 ...]] ==> ... */
-                                       /* op1 = arg count, val.a = method pointer    */
-
-               case ICMD_INVOKEINTERFACE:/*.., objectref, [arg1, [arg2 ...]] ==> ... */
-                                       /* op1 = arg count, val.a = method pointer    */
+               case ICMD_INVOKEVIRTUAL:/* op1 = arg count, val.a = method pointer    */
+               case ICMD_INVOKEINTERFACE:
 
-                       s3 = iptr->op1;
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                               md = INSTRUCTION_UNRESOLVED_METHOD(iptr)->methodref->parseddesc.md;
+                               lm = NULL;
+                       }
+                       else {
+                               lm = INSTRUCTION_RESOLVED_METHODINFO(iptr);
+                               md = lm->parseddesc;
+                       }
 
-gen_method: {
-                       methodinfo *lm;
-                       classinfo  *ci;
+gen_method:
+                       s3 = md->paramcount;
 
                        MCODECHECK((s3 << 1) + 64);
 
-                       {
-                       /* copy arguments to registers or stack location                  */
-
-                               stackptr srcsave = src;
-                               int s3save = s3;
-                               int fltcnt = 0;
-                               int argsize = 0;
-                       for (; --s3 >= 0; src = src->prev) {
-                               argsize += IS_2_WORD_TYPE(src->type) ? 2 : 1;
-                               if (IS_FLT_DBL_TYPE(src->type))
-                                       ++fltcnt;
-                               }
+                       /* copy arguments to registers or stack location */
 
-                       for (s3 = s3save, src = srcsave; --s3 >= 0; src = src->prev) {
-                               argsize -= IS_2_WORD_TYPE(src->type) ? 2 : 1;
-                               if (IS_FLT_DBL_TYPE(src->type))
-                                       --fltcnt;
+                       for (s3 = s3 - 1; s3 >= 0; s3--, src = src->prev) {
                                if (src->varkind == ARGVAR)
                                        continue;
                                if (IS_INT_LNG_TYPE(src->type)) {
-                                       if (argsize < INT_ARG_CNT) {
-                                               s1 = rd->argintregs[argsize];
-                                               var_to_reg_int(d, src, s1);
-                                               if (argsize < INT_ARG_CNT-1) {
-                                                       M_TINTMOVE(src->type, d, s1);
-
-                                               } else {
+                                       if (!md->params[s3].inmemory) {
+                                               if (IS_2_WORD_TYPE(src->type)) {
+                                                       s1 = PACK_REGS(
+                                                  rd->argintregs[GET_LOW_REG(md->params[s3].regoff)],
+                                                  rd->argintregs[GET_HIGH_REG(md->params[s3].regoff)]);
+                                                       d = emit_load_s1(jd, iptr, src, s1);
+                                                       M_LNGMOVE(d, s1);
+                                               }
+                                               else {
+                                                       s1 = rd->argintregs[md->params[s3].regoff];
+                                                       d = emit_load_s1(jd, iptr, src, s1);
                                                        M_INTMOVE(d, s1);
-                                                       if (IS_2_WORD_TYPE(src->type))
-                                                               M_IST(rd->secondregs[d], REG_SP, 4 * (argsize + 6) + 4);
                                                }
-
-                                       } else {
-                                               var_to_reg_int(d, src, REG_ITMP1);
-                                               M_IST(d, REG_SP, 4 * (argsize + 6));
-                                               if (IS_2_WORD_TYPE(src->type))
-                                                       M_IST(rd->secondregs[d], REG_SP, 4 * (argsize + 6) + 4);
                                        }
-
-                               } else {
-                                       if (fltcnt < FLT_ARG_CNT) {
-                                               s1 = rd->argfltregs[fltcnt];
-                                               var_to_reg_flt(d, src, s1);
+                                       else {
+                                               if (IS_2_WORD_TYPE(src->type)) {
+                                                       d = emit_load_s1(jd, iptr, src, REG_ITMP12_PACKED);
+                                                       M_LST(d, REG_SP, md->params[s3].regoff * 4);
+                                               }
+                                               else {
+                                                       d = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                                                       M_IST(d, REG_SP, md->params[s3].regoff * 4);
+                                               }
+                                       }
+                               }
+                               else {
+                                       if (!md->params[s3].inmemory) {
+                                               s1 = rd->argfltregs[md->params[s3].regoff];
+                                               d = emit_load_s1(jd, iptr, src, s1);
                                                M_FLTMOVE(d, s1);
-
-                                       else {
-                                               var_to_reg_flt(d, src, REG_FTMP1);
+                                       }
+                                       else {
+                                               d = emit_load_s1(jd, iptr, src, REG_FTMP1);
                                                if (IS_2_WORD_TYPE(src->type))
-                                                       M_DST(d, REG_SP, 4 * (argsize + 6));
+                                                       M_DST(d, REG_SP, md->params[s3].regoff * 4);
                                                else
-                                                       M_FST(d, REG_SP, 4 * (argsize + 6));
+                                                       M_FST(d, REG_SP, md->params[s3].regoff * 4);
                                        }
                                }
                        } /* end of for */
-                       }
 
-                       lm = iptr->val.a;
                        switch (iptr->opc) {
-                               case ICMD_BUILTIN3:
-                               case ICMD_BUILTIN2:
-                               case ICMD_BUILTIN1:
-                                       a = dseg_addaddress(cd, (void *) lm);
+                       case ICMD_BUILTIN:
+                               disp = dseg_add_functionptr(cd, bte->fp);
+                               d = md->returntype.type;
 
-                                       M_ALD(REG_PV, REG_PV, a); /* Pointer to built-in-function */
-                                       d = iptr->op1;
-                                       goto makeactualcall;
+                               M_ALD(REG_PV, REG_PV, disp);  /* pointer to built-in-function */
+                               M_MTCTR(REG_PV);
+                               M_JSR;
+                               disp = (s4) (cd->mcodeptr - cd->mcodebase);
+                               M_MFLR(REG_ITMP1);
+                               M_LDA(REG_PV, REG_ITMP1, -disp);
+
+                               /* if op1 == true, we need to check for an exception */
 
-                               case ICMD_INVOKESTATIC:
-                               case ICMD_INVOKESPECIAL:
-                                       a = dseg_addaddress(cd, lm->stubroutine);
+                               if (iptr->op1 == true) {
+                                       M_CMPI(REG_RESULT, 0);
+                                       M_BEQ(0);
+                                       codegen_add_fillinstacktrace_ref(cd);
+                               }
+                               break;
 
-                                       M_ALD(REG_PV, REG_PV, a);       /* method pointer in r27 */
+                       case ICMD_INVOKESPECIAL:
+                               gen_nullptr_check(rd->argintregs[0]);
+                               M_ILD(REG_ITMP1, rd->argintregs[0], 0); /* hardware nullptr   */
+                               /* fall through */
 
-                                       d = lm->returntype;
-                                       goto makeactualcall;
+                       case ICMD_INVOKESTATIC:
+                               if (lm == NULL) {
+                                       unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
 
-                               case ICMD_INVOKEVIRTUAL:
+                                       disp = dseg_add_unique_address(cd, um);
 
-                                       gen_nullptr_check(rd->argintregs[0]);
-                                       M_ALD(REG_METHODPTR, rd->argintregs[0],
-                                                 OFFSET(java_objectheader, vftbl));
-                                       M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl_t, table[0]) +
-                                                 sizeof(methodptr) * lm->vftblindex);
+                                       codegen_addpatchref(cd, PATCHER_invokestatic_special,
+                                                                               um, disp);
 
-                                       d = lm->returntype;
-                                       goto makeactualcall;
+                                       if (opt_showdisassemble)
+                                               M_NOP;
 
-                               case ICMD_INVOKEINTERFACE:
-                                       ci = lm->class;
-                                       
-                                       gen_nullptr_check(rd->argintregs[0]);
-                                       M_ALD(REG_METHODPTR, rd->argintregs[0],
-                                                 OFFSET(java_objectheader, vftbl));    
-                                       M_ALD(REG_METHODPTR, REG_METHODPTR,
-                                             OFFSET(vftbl_t, interfacetable[0]) -
-                                             sizeof(methodptr*) * ci->index);
-                                       M_ALD(REG_PV, REG_METHODPTR,
-                                                 sizeof(methodptr) * (lm - ci->methods));
-
-                                       d = lm->returntype;
-                                       goto makeactualcall;
-
-                               default:
-                                       d = 0;
-                                       error ("Unkown ICMD-Command: %d", iptr->opc);
+                                       d = md->returntype.type;
+                               }
+                               else {
+                                       disp = dseg_add_address(cd, lm->stubroutine);
+                                       d = md->returntype.type;
                                }
 
-makeactualcall:
-                       M_MTCTR(REG_PV);
-                       M_JSR;
+                               M_ALD(REG_PV, REG_PV, disp);
+                               M_MTCTR(REG_PV);
+                               M_JSR;
+                               disp = (s4) (cd->mcodeptr - cd->mcodebase);
+                               M_MFLR(REG_ITMP1);
+                               M_LDA(REG_PV, REG_ITMP1, -disp);
+                               break;
 
-                       /* recompute pv */
+                       case ICMD_INVOKEVIRTUAL:
+                               gen_nullptr_check(rd->argintregs[0]);
 
-                       s1 = (s4) ((u1 *) mcodeptr - cd->mcodebase);
-                       M_MFLR(REG_ITMP1);
-                       if (s1 <= 32768) M_LDA(REG_PV, REG_ITMP1, -s1);
-                       else {
-                               s4 ml = -s1, mh = 0;
-                               while (ml < -32768) { ml += 65536; mh--; }
-                               M_LDA(REG_PV, REG_ITMP1, ml);
-                               M_LDAH(REG_PV, REG_PV, mh);
-                       }
+                               if (lm == NULL) {
+                                       unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
 
-                       /* d contains return type */
+                                       codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
 
-                       if (d != TYPE_VOID) {
-                               if (IS_INT_LNG_TYPE(iptr->dst->type)) {
-                                       s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
-                                       M_TINTMOVE(iptr->dst->type, REG_RESULT, s1);
-                                       store_reg_to_var_int(iptr->dst, s1);
+                                       if (opt_showdisassemble)
+                                               M_NOP;
 
-                               } else {
-                                       s1 = reg_of_var(rd, iptr->dst, REG_FRESULT);
-                                       M_FLTMOVE(REG_FRESULT, s1);
-                                       store_reg_to_var_flt(iptr->dst, s1);
+                                       s1 = 0;
+                                       d = md->returntype.type;
                                }
-                       }
-                       }
-                       break;
+                               else {
+                                       s1 = OFFSET(vftbl_t, table[0]) +
+                                               sizeof(methodptr) * lm->vftblindex;
+                                       d = md->returntype.type;
+                               }
+
+                               M_ALD(REG_METHODPTR, rd->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));
+                               M_ALD(REG_PV, REG_METHODPTR, s1);
+                               M_MTCTR(REG_PV);
+                               M_JSR;
+                               disp = (s4) (cd->mcodeptr - cd->mcodebase);
+                               M_MFLR(REG_ITMP1);
+                               M_LDA(REG_PV, REG_ITMP1, -disp);
+                               break;
 
+                       case ICMD_INVOKEINTERFACE:
+                               gen_nullptr_check(rd->argintregs[0]);
 
-               case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult            */
+                               if (lm == NULL) {
+                                       unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
 
-                                     /* op1:   0 == array, 1 == class                */
-                                     /* val.a: (classinfo*) superclass               */
+                                       codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
 
-/*          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));
- */
+                                       if (opt_showdisassemble)
+                                               M_NOP;
 
-                       {
-                       classinfo *super = (classinfo*) iptr->val.a;
-                       
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-            codegen_threadcritrestart(cd, (u1*) mcodeptr - cd->mcodebase);
-#endif
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP3);
-                       if (s1 == d) {
-                               M_MOV(s1, REG_ITMP1);
-                               s1 = REG_ITMP1;
+                                       s1 = 0;
+                                       s2 = 0;
+                                       d = md->returntype.type;
                                }
-                       M_CLR(d);
-                       if (iptr->op1) {                               /* class/interface */
-                               M_TST(s1);
-                               if (super->flags & ACC_INTERFACE) {        /* interface       */
-                                       M_BEQ(9);
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                                       M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
-                                       M_LDATST(REG_ITMP2, REG_ITMP2, - super->index);
-                                       M_BLE(5);
-                                       M_ALD(REG_ITMP1, REG_ITMP1,
-                                             OFFSET(vftbl_t, interfacetable[0]) -
-                                             super->index * sizeof(methodptr*));
-                                       M_TST(REG_ITMP1);
-                                       M_CLR(d);
-                                       M_BEQ(1);
-                                       M_IADD_IMM(REG_ZERO, 1, d);
+                               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_METHODPTR, rd->argintregs[0],
+                                         OFFSET(java_objectheader, vftbl));    
+                               M_ALD(REG_METHODPTR, REG_METHODPTR, s1);
+                               M_ALD(REG_PV, REG_METHODPTR, s2);
+                               M_MTCTR(REG_PV);
+                               M_JSR;
+                               disp = (s4) (cd->mcodeptr - cd->mcodebase);
+                               M_MFLR(REG_ITMP1);
+                               M_LDA(REG_PV, REG_ITMP1, -disp);
+                               break;
+                       }
+
+                       /* d contains return type */
+
+                       if (d != TYPE_VOID) {
+                               if (IS_INT_LNG_TYPE(iptr->dst->type)) {
+                                       if (IS_2_WORD_TYPE(iptr->dst->type)) {
+                                               s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT_PACKED);
+                                               M_LNGMOVE(REG_RESULT_PACKED, s1);
                                        }
-                               else {                                     /* class           */
-                                       M_BEQ(10);
-                                       M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
-                                       a = dseg_addaddress(cd, (void*) super->vftbl);
-                                       M_ALD(REG_ITMP2, REG_PV, a);
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       codegen_threadcritstart(cd, (u1*) mcodeptr - cd->mcodebase);
-#endif
-                                       M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
-                                       M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
-                                       M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       codegen_threadcritstop(cd, (u1*) mcodeptr - cd->mcodebase);
-#endif
-                                       M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
-                                       M_CMPU(REG_ITMP1, REG_ITMP2);
-                                       M_CLR(d);
-                                       M_BGT(1);
-                                       M_IADD_IMM(REG_ZERO, 1, d);
+                                       else {
+                                               s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT);
+                                               M_INTMOVE(REG_RESULT, s1);
                                        }
                                }
-                       else
-                               panic ("internal error: no inlined array instanceof");
+                               else {
+                                       s1 = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FRESULT);
+                                       M_FLTMOVE(REG_FRESULT, s1);
+                               }
+                               emit_store(jd, iptr, iptr->dst, s1);
                        }
-                       store_reg_to_var_int(iptr->dst, d);
                        break;
 
-               case ICMD_CHECKCAST:  /* ..., objectref ==> ..., objectref            */
 
+               case ICMD_CHECKCAST:  /* ..., objectref ==> ..., objectref            */
                                      /* 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));
- */
-
-                       {
-                       classinfo *super = (classinfo*) iptr->val.a;
+                       /*  superclass is an interface:
+                        *
+                        *  OK if ((sub == NULL) ||
+                        *         (sub->vftbl->interfacetablelength > super->index) &&
+                        *         (sub->vftbl->interfacetable[-super->index] != NULL));
+                        *
+                        *  superclass is a class:
+                        *
+                        *  OK if ((sub == NULL) || (0
+                        *         <= (sub->vftbl->baseval - super->vftbl->baseval) <=
+                        *         super->vftbl->diffvall));
+                        */
+
+                       if (iptr->op1 == 1) {
+                               /* object type cast-check */
+
+                               classinfo *super;
+                               s4         superindex;
+
+                               super = (classinfo *) iptr->val.a;
+
+                               if (super == NULL)
+                                       superindex = 0;
+                               else
+                                       superindex = super->index;
                        
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                       codegen_threadcritrestart(cd, (u1*) mcodeptr - cd->mcodebase);
+#if defined(ENABLE_THREADS)
+                               codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
 #endif
-                       d = reg_of_var(rd, iptr->dst, REG_ITMP1);
-                       var_to_reg_int(s1, src, d);
-                       if (iptr->op1) {                               /* class/interface */
-                               M_TST(s1);
-                               if (super->flags & ACC_INTERFACE) {        /* interface       */
-                                       M_BEQ(7);
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+
+                               /* calculate interface checkcast code size */
+
+                               s2 = 7;
+                               if (!super)
+                                       s2 += (opt_showdisassemble ? 1 : 0);
+
+                               /* calculate class checkcast code size */
+
+                               s3 = 8 + (s1 == REG_ITMP1);
+                               if (!super)
+                                       s3 += (opt_showdisassemble ? 1 : 0);
+
+                               /* if class is not resolved, check which code to call */
+
+                               if (super == NULL) {
+                                       M_TST(s1);
+                                       M_BEQ(3 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+
+                                       disp = dseg_add_unique_s4(cd, 0);         /* super->flags */
+
+                                       codegen_addpatchref(cd,
+                                                                               PATCHER_resolve_classref_to_flags,
+                                                                               (constant_classref *) iptr->target,
+                                                                               disp);
+
+                                       if (opt_showdisassemble)
+                                               M_NOP;
+
+                                       M_ILD(REG_ITMP2, REG_PV, disp);
+                                       M_AND_IMM(REG_ITMP2, ACC_INTERFACE, REG_ITMP2);
+                                       M_BEQ(s2 + 1);
+                               }
+
+                               /* interface checkcast code */
+
+                               if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+                                       if (super == NULL) {
+                                               codegen_addpatchref(cd,
+                                                                                       PATCHER_checkcast_instanceof_interface,
+                                                                                       (constant_classref *) iptr->target,
+                                                                                       0);
+
+                                               if (opt_showdisassemble)
+                                                       M_NOP;
+                                       }
+                                       else {
+                                               M_TST(s1);
+                                               M_BEQ(s2);
+                                       }
+
                                        M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
                                        M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
-                                       M_LDATST(REG_ITMP3, REG_ITMP3, - super->index);
+                                       M_LDATST(REG_ITMP3, REG_ITMP3, -superindex);
                                        M_BLE(0);
-                                       codegen_addxcastrefs(cd, mcodeptr);
+                                       codegen_add_classcastexception_ref(cd, s1);
                                        M_ALD(REG_ITMP3, REG_ITMP2,
-                                             OFFSET(vftbl_t, interfacetable[0]) -
-                                             super->index * sizeof(methodptr*));
+                                                 OFFSET(vftbl_t, interfacetable[0]) -
+                                                 superindex * sizeof(methodptr*));
                                        M_TST(REG_ITMP3);
                                        M_BEQ(0);
-                                       codegen_addxcastrefs(cd, mcodeptr);
+                                       codegen_add_classcastexception_ref(cd, s1);
+
+                                       if (super == NULL)
+                                               M_BR(s3);
+                               }
+
+                               /* class checkcast code */
+
+                               if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
+                                       if (super == NULL) {
+                                               disp = dseg_add_unique_address(cd, NULL);
+
+                                               codegen_addpatchref(cd, PATCHER_resolve_classref_to_vftbl,
+                                                                                       (constant_classref *) iptr->target,
+                                                                                       disp);
+
+                                               if (opt_showdisassemble)
+                                                       M_NOP;
+                                       }
+                                       else {
+                                               disp = dseg_add_address(cd, super->vftbl);
+
+                                               M_TST(s1);
+                                               M_BEQ(s3);
                                        }
-                               else {                                     /* class           */
-                    M_BEQ(8 + (s1 == REG_ITMP1));
-                    M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                       codegen_threadcritstart(cd, (u1*) mcodeptr - cd->mcodebase);
+
+                                       M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+#if defined(ENABLE_THREADS)
+                                       codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
 #endif
-                    M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
-                    a = dseg_addaddress(cd, (void*) super->vftbl);
-                    M_ALD(REG_ITMP2, REG_PV, a);
-                    if (d != REG_ITMP1) {
-                        M_ILD(REG_ITMP1, REG_ITMP2, OFFSET(vftbl_t, baseval));
-                        M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                               codegen_threadcritstop(cd, (u1*) mcodeptr - cd->mcodebase);
+                                       M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
+                                       M_ALD(REG_ITMP2, REG_PV, disp);
+                                       if (s1 != REG_ITMP1) {
+                                               M_ILD(REG_ITMP1, REG_ITMP2, OFFSET(vftbl_t, baseval));
+                                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+#if defined(ENABLE_THREADS)
+                                               codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
 #endif
-                        M_ISUB(REG_ITMP3, REG_ITMP1, REG_ITMP3);
-                        }
-                    else {
-                        M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
-                        M_ISUB(REG_ITMP3, REG_ITMP2, REG_ITMP3);
-                        M_ALD(REG_ITMP2, REG_PV, a);
-                        M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-                                               codegen_threadcritstop(cd, (u1*) mcodeptr - cd->mcodebase);
+                                               M_ISUB(REG_ITMP3, REG_ITMP1, REG_ITMP3);
+                                       } else {
+                                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
+                                               M_ISUB(REG_ITMP3, REG_ITMP2, REG_ITMP3);
+                                               M_ALD(REG_ITMP2, REG_PV, disp);
+                                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+#if defined(ENABLE_THREADS)
+                                               codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
 #endif
-                        }
-                    M_CMPU(REG_ITMP3, REG_ITMP2);
-                    M_BGT(0);
-                    codegen_addxcastrefs(cd, mcodeptr);
-                    }
+                                       }
+                                       M_CMPU(REG_ITMP3, REG_ITMP2);
+                                       M_BGT(0);
+                                       codegen_add_classcastexception_ref(cd, s1);
                                }
-                       else
-                               panic ("internal error: no inlined array checkcast");
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, s1);
                        }
-                       M_INTMOVE(s1, d);
-                       store_reg_to_var_int(iptr->dst, d);
-                       break;
+                       else {
+                               /* array type cast-check */
 
-               case ICMD_CHECKASIZE:  /* ..., size ==> ..., size                     */
+                               s1 = emit_load_s1(jd, iptr, src, rd->argintregs[0]);
+                               M_INTMOVE(s1, rd->argintregs[0]);
 
-                       var_to_reg_int(s1, src, REG_ITMP1);
-                       M_CMPI(s1, 0);
-                       M_BLT(0);
-                       codegen_addxcheckarefs(cd, mcodeptr);
-                       break;
+                               if (iptr->val.a == NULL) {
+                                       disp = dseg_add_unique_address(cd, NULL);
 
-               case ICMD_CHECKEXCEPTION:   /* ... ==> ...                            */
+                                       codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
+                                                                               (constant_classref *) iptr->target,
+                                                                               disp);
 
-                       M_CMPI(REG_RESULT, 0);
-                       M_BEQ(0);
-                       codegen_addxexceptionrefs(cd, mcodeptr);
+                                       if (opt_showdisassemble)
+                                               M_NOP;
+                               }
+                               else
+                                       disp = dseg_add_address(cd, iptr->val.a);
+
+                               M_ALD(rd->argintregs[1], REG_PV, disp);
+                               disp = dseg_add_functionptr(cd, BUILTIN_arraycheckcast);
+                               M_ALD(REG_ITMP2, REG_PV, disp);
+                               M_MTCTR(REG_ITMP2);
+                               M_JSR;
+                               M_TST(REG_RESULT);
+                               M_BEQ(0);
+                               codegen_add_classcastexception_ref(cd, s1);
+
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                               d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, s1);
+                       }
+                       M_INTMOVE(s1, d);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
+
+               case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult            */
+                                     /* val.a: (classinfo*) superclass               */
+
+                       /*  superclass is an interface:
+                        *
+                        *  return (sub != NULL) &&
+                        *         (sub->vftbl->interfacetablelength > super->index) &&
+                        *         (sub->vftbl->interfacetable[-super->index] != NULL);
+                        *
+                        *  superclass is a class:
+                        *
+                        *  return ((sub != NULL) && (0
+                        *          <= (sub->vftbl->baseval - super->vftbl->baseval) <=
+                        *          super->vftbl->diffvall));
+                        */
+
+                       {
+                       classinfo *super;
+                       s4         superindex;
+
+                       super = (classinfo *) iptr->val.a;
+
+                       if (super == NULL)
+                               superindex = 0;
+                       else
+                               superindex = super->index;
+                       
+#if defined(ENABLE_THREADS)
+            codegen_threadcritrestart(cd, cd->mcodeptr - cd->mcodebase);
+#endif
+                       s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
+                       if (s1 == d) {
+                               M_MOV(s1, REG_ITMP1);
+                               s1 = REG_ITMP1;
+                       }
+
+                       /* calculate interface instanceof code size */
+
+                       s2 = 8;
+                       if (!super)
+                               s2 += (opt_showdisassemble ? 1 : 0);
+
+                       /* calculate class instanceof code size */
+
+                       s3 = 10;
+                       if (!super)
+                               s3 += (opt_showdisassemble ? 1 : 0);
+
+                       M_CLR(d);
+
+                       /* if class is not resolved, check which code to call */
+
+                       if (super == NULL) {
+                               M_TST(s1);
+                               M_BEQ(3 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+
+                               disp = dseg_add_unique_s4(cd, 0);             /* super->flags */
+
+                               codegen_addpatchref(cd, PATCHER_resolve_classref_to_flags,
+                                                                       (constant_classref *) iptr->target, disp);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
+
+                               M_ILD(REG_ITMP3, REG_PV, disp);
+                               M_AND_IMM(REG_ITMP3, ACC_INTERFACE, REG_ITMP3);
+                               M_BEQ(s2 + 1);
+                       }
+
+                       /* interface instanceof code */
+
+                       if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
+                               if (super == NULL) {
+                                       codegen_addpatchref(cd,
+                                                                               PATCHER_checkcast_instanceof_interface,
+                                                                               (constant_classref *) iptr->target, 0);
+
+                                       if (opt_showdisassemble)
+                                               M_NOP;
+                               }
+                               else {
+                                       M_TST(s1);
+                                       M_BEQ(s2);
+                               }
+
+                               M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+                               M_ILD(REG_ITMP3, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
+                               M_LDATST(REG_ITMP3, REG_ITMP3, -superindex);
+                               M_BLE(4);
+                               M_ALD(REG_ITMP1, REG_ITMP1,
+                                         OFFSET(vftbl_t, interfacetable[0]) -
+                                         superindex * sizeof(methodptr*));
+                               M_TST(REG_ITMP1);
+                               M_BEQ(1);
+                               M_IADD_IMM(REG_ZERO, 1, d);
+
+                               if (super == NULL)
+                                       M_BR(s3);
+                       }
+
+                       /* class instanceof code */
+
+                       if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
+                               if (super == NULL) {
+                                       disp = dseg_add_unique_address(cd, NULL);
+
+                                       codegen_addpatchref(cd, PATCHER_resolve_classref_to_vftbl,
+                                                                               (constant_classref *) iptr->target,
+                                                                               disp);
+
+                                       if (opt_showdisassemble)
+                                               M_NOP;
+                               }
+                               else {
+                                       disp = dseg_add_address(cd, super->vftbl);
+
+                                       M_TST(s1);
+                                       M_BEQ(s3);
+                               }
+
+                               M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+                               M_ALD(REG_ITMP2, REG_PV, disp);
+#if defined(ENABLE_THREADS)
+                               codegen_threadcritstart(cd, cd->mcodeptr - cd->mcodebase);
+#endif
+                               M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
+                               M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
+                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+#if defined(ENABLE_THREADS)
+                               codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase);
+#endif
+                               M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
+                               M_CMPU(REG_ITMP1, REG_ITMP2);
+                               M_CLR(d);
+                               M_BGT(1);
+                               M_IADD_IMM(REG_ZERO, 1, d);
+                       }
+                       emit_store(jd, iptr, iptr->dst, d);
+                       }
                        break;
 
                case ICMD_MULTIANEWARRAY:/* ..., cnt1, [cnt2, ...] ==> ..., arrayref  */
-                                     /* op1 = dimension, val.a = array descriptor    */
+                                     /* op1 = dimension, val.a = class               */
 
                        /* check for negative sizes and copy sizes to stack if necessary  */
 
                        MCODECHECK((iptr->op1 << 1) + 64);
 
                        for (s1 = iptr->op1; --s1 >= 0; src = src->prev) {
-                               var_to_reg_int(s2, src, REG_ITMP1);
-                               M_CMPI(s2, 0);
-                               M_BLT(0);
-                               codegen_addxcheckarefs(cd, mcodeptr);
-
                                /* copy SAVEDVAR sizes to stack */
 
                                if (src->varkind != ARGVAR) {
-                                       M_IST(s2, REG_SP, (s1 + INT_ARG_CNT + 6) * 4);
+                                       s2 = emit_load_s2(jd, iptr, src, REG_ITMP1);
+#if defined(__DARWIN__)
+                                       M_IST(s2, REG_SP, LA_SIZE + (s1 + INT_ARG_CNT) * 4);
+#else
+                                       M_IST(s2, REG_SP, LA_SIZE + (s1 + 3) * 4);
+#endif
                                }
                        }
 
@@ -2931,37 +3373,53 @@ makeactualcall:
 
                        ICONST(rd->argintregs[0], iptr->op1);
 
+                       /* is patcher function set? */
+
+                       if (iptr->val.a == NULL) {
+                               disp = dseg_add_unique_address(cd, NULL);
+
+                               codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
+                                                                       (constant_classref *) iptr->target, disp);
+
+                               if (opt_showdisassemble)
+                                       M_NOP;
+                       }
+                       else
+                               disp = dseg_add_address(cd, iptr->val.a);
+
                        /* a1 = arraydescriptor */
 
-                       a = dseg_addaddress(cd, iptr->val.a);
-                       M_ALD(rd->argintregs[1], REG_PV, a);
+                       M_ALD(rd->argintregs[1], REG_PV, disp);
 
                        /* a2 = pointer to dimensions = stack pointer */
 
-                       M_LDA(rd->argintregs[2], REG_SP, (INT_ARG_CNT + 6) * 4);
+#if defined(__DARWIN__)
+                       M_LDA(rd->argintregs[2], REG_SP, LA_SIZE + INT_ARG_CNT * 4);
+#else
+                       M_LDA(rd->argintregs[2], REG_SP, LA_SIZE + 3 * 4);
+#endif
 
-                       a = dseg_addaddress(cd, (void *) builtin_nmultianewarray);
-                       M_ALD(REG_PV, REG_PV, a);
-                       M_MTCTR(REG_PV);
+                       disp = dseg_add_functionptr(cd, BUILTIN_multianewarray);
+                       M_ALD(REG_ITMP3, REG_PV, disp);
+                       M_MTCTR(REG_ITMP3);
                        M_JSR;
-                       s1 = (s4) ((u1 *) mcodeptr - cd->mcodebase);
-                       M_MFLR(REG_ITMP1);
-                       if (s1 <= 32768)
-                               M_LDA (REG_PV, REG_ITMP1, -s1);
-                       else {
-                               s4 ml = -s1, mh = 0;
-                               while (ml < -32768) {ml += 65536; mh--;}
-                               M_LDA(REG_PV, REG_ITMP1, ml);
-                               M_LDAH(REG_PV, REG_PV, mh);
-                           }
-                       s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
-                       M_INTMOVE(REG_RESULT, s1);
-                       store_reg_to_var_int(iptr->dst, s1);
-                       break;
 
+                       /* check for exception before result assignment */
 
-               default: error ("Unknown pseudo command: %d", iptr->opc);
-       
+                       M_CMPI(REG_RESULT, 0);
+                       M_BEQ(0);
+                       codegen_add_fillinstacktrace_ref(cd);
+
+                       d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_RESULT);
+                       M_INTMOVE(REG_RESULT, d);
+                       emit_store(jd, iptr, iptr->dst, d);
+                       break;
+
+               default:
+                       *exceptionptr =
+                               new_internalerror("Unknown ICMD %d during code generation",
+                                                                 iptr->opc);
+                       return false;
        } /* switch */
                
        } /* for instruction */
@@ -2971,7 +3429,7 @@ makeactualcall:
        src = bptr->outstack;
        len = bptr->outdepth;
        MCODECHECK(64 + len);
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
        if (!opt_lsra)
 #endif
        while (src) {
@@ -2979,23 +3437,25 @@ makeactualcall:
                if ((src->varkind != STACKVAR)) {
                        s2 = src->type;
                        if (IS_FLT_DBL_TYPE(s2)) {
-                               var_to_reg_flt(s1, src, REG_FTMP1);
-                               if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+                               s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
+                               if (!(rd->interfaces[len][s2].flags & INMEMORY))
                                        M_FLTMOVE(s1, rd->interfaces[len][s2].regoff);
-
-                               } else {
+                               else
                                        M_DST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
-                               }
 
                        } else {
-                               var_to_reg_int(s1, src, REG_ITMP1);
+                               s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
                                if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
-                                       M_TINTMOVE(s2, s1, rd->interfaces[len][s2].regoff);
+                                       if (IS_2_WORD_TYPE(s2))
+                                               M_LNGMOVE(s1, rd->interfaces[len][s2].regoff);
+                                       else
+                                               M_INTMOVE(s1, rd->interfaces[len][s2].regoff);
 
                                } else {
-                                       M_IST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
                                        if (IS_2_WORD_TYPE(s2))
-                                               M_IST(rd->secondregs[s1], REG_SP, rd->interfaces[len][s2].regoff * 4 + 4);
+                                               M_LST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
+                                       else
+                                               M_IST(s1, REG_SP, rd->interfaces[len][s2].regoff * 4);
                                }
                        }
                }
@@ -3004,662 +3464,395 @@ makeactualcall:
        } /* if (bptr -> flags >= BBREACHED) */
        } /* for basic block */
 
-       /* bptr -> mpc = (int)((u1*) mcodeptr - mcodebase); */
+       dseg_createlinenumbertable(cd);
 
-       {
-       /* generate bound check stubs */
+       /* generate stubs */
 
-       s4 *xcodeptr = NULL;
-       branchref *bref;
+       emit_exception_stubs(jd);
+       emit_patcher_stubs(jd);
+       emit_replacement_stubs(jd);
 
-       for (bref = cd->xboundrefs; bref != NULL; bref = bref->next) {
-               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                 bref->branchpos,
-                                                 (u1 *) mcodeptr - cd->mcodebase);
+       codegen_finish(jd);
 
-               MCODECHECK(14);
+       /* everything's ok */
 
-               /* move index register into REG_ITMP1 */
-               M_MOV(bref->reg, REG_ITMP1);
-               M_LDA(REG_ITMP2_XPC, REG_PV, bref->branchpos - 4);
+       return true;
+}
 
-               if (xcodeptr != NULL) {
-                       M_BR(xcodeptr - mcodeptr - 1);
 
-               } else {
-                       xcodeptr = mcodeptr;
+/* createcompilerstub **********************************************************
 
-                       M_STWU(REG_SP, REG_SP, -(24 + 2 * 4));
-                       M_IST(REG_ITMP2_XPC, REG_SP, 24 + 1 * 4);
+   Creates a stub routine which calls the compiler.
+       
+*******************************************************************************/
 
-                       M_MOV(REG_ITMP1, rd->argintregs[0]);
+#define COMPILERSTUB_DATASIZE    3 * SIZEOF_VOID_P
+#define COMPILERSTUB_CODESIZE    4 * 4
 
-                       a = dseg_addaddress(cd, new_arrayindexoutofboundsexception);
-                       M_ALD(REG_ITMP2, REG_PV, a);
-                       M_MTCTR(REG_ITMP2);
-                       M_JSR;
-                       M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+#define COMPILERSTUB_SIZE        COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
 
-                       M_ILD(REG_ITMP2_XPC, REG_SP, 24 + 1 * 4);
-                       M_IADD_IMM(REG_SP, 24 + 2 * 4, REG_SP);
 
-                       a = dseg_addaddress(cd, asm_handle_exception);
-                       M_ALD(REG_ITMP3, REG_PV, a);
+u1 *createcompilerstub(methodinfo *m)
+{
+       u1          *s;                     /* memory to hold the stub            */
+       ptrint      *d;
+       codeinfo    *code;
+       codegendata *cd;
+       s4           dumpsize;
 
-                       M_MTCTR(REG_ITMP3);
-                       M_RTS;
-               }
-       }
+       s = CNEW(u1, COMPILERSTUB_SIZE);
 
-       /* generate negative array size check stubs */
+       /* set data pointer and code pointer */
 
-       xcodeptr = NULL;
-       
-       for (bref = cd->xcheckarefs; bref != NULL; bref = bref->next) {
-               if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                                         bref->branchpos,
-                                                         (u1 *) xcodeptr - (u1 *) cd->mcodebase - 4);
-                       continue;
-               }
+       d = (ptrint *) s;
+       s = s + COMPILERSTUB_DATASIZE;
 
-               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                 bref->branchpos,
-                                                 (u1 *) mcodeptr - cd->mcodebase);
+       /* mark start of dump memory area */
 
-               MCODECHECK(12);
+       dumpsize = dump_size();
 
-               M_LDA(REG_ITMP2_XPC, REG_PV, bref->branchpos - 4);
+       cd = DNEW(codegendata);
+       cd->mcodeptr = s;
 
-               if (xcodeptr != NULL) {
-                       M_BR(xcodeptr - mcodeptr - 1);
+       /* Store the codeinfo pointer in the same place as in the
+          methodheader for compiled methods. */
 
-               } else {
-                       xcodeptr = mcodeptr;
+       code = code_codeinfo_new(m);
 
-                       M_STWU(REG_SP, REG_SP, -(24 + 1 * 4));
-                       M_IST(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
+       d[0] = (ptrint) asm_call_jit_compiler;
+       d[1] = (ptrint) m;
+       d[2] = (ptrint) code;
 
-            a = dseg_addaddress(cd, new_negativearraysizeexception);
-            M_ALD(REG_ITMP2, REG_PV, a);
-            M_MTCTR(REG_ITMP2);
-            M_JSR;
-            M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+       M_ALD_INTERN(REG_ITMP1, REG_PV, -2 * SIZEOF_VOID_P);
+       M_ALD_INTERN(REG_PV, REG_PV, -3 * SIZEOF_VOID_P);
+       M_MTCTR(REG_PV);
+       M_RTS;
 
-                       M_ILD(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
-                       M_IADD_IMM(REG_SP, 24 + 1 * 4, REG_SP);
+       md_cacheflush((u1 *) d, COMPILERSTUB_SIZE);
 
-                       a = dseg_addaddress(cd, asm_handle_exception);
-                       M_ALD(REG_ITMP3, REG_PV, a);
+#if defined(ENABLE_STATISTICS)
+       if (opt_stat)
+               count_cstub_len += COMPILERSTUB_SIZE;
+#endif
 
-                       M_MTCTR(REG_ITMP3);
-                       M_RTS;
-               }
-       }
+       /* release dump area */
 
-       /* generate cast check stubs */
+       dump_release(dumpsize);
 
-       xcodeptr = NULL;
-       
-       for (bref = cd->xcastrefs; bref != NULL; bref = bref->next) {
-               if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                                         bref->branchpos,
-                                                         (u1 *) xcodeptr - (u1 *) cd->mcodebase - 4);
-                       continue;
-               }
+       return s;
+}
 
-               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                 bref->branchpos,
-                                                 (u1 *) mcodeptr - cd->mcodebase);
 
-               MCODECHECK(12);
+/* createnativestub ************************************************************
 
-               M_LDA(REG_ITMP2_XPC, REG_PV, bref->branchpos - 4);
+   Creates a stub routine which calls a native method.
 
-               if (xcodeptr != NULL) {
-                       M_BR(xcodeptr - mcodeptr - 1);
+*******************************************************************************/
 
-               } else {
-                       xcodeptr = mcodeptr;
+u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
+{
+       methodinfo   *m;
+       codeinfo     *code;
+       codegendata  *cd;
+       registerdata *rd;
+       methoddesc   *md;
+       s4            nativeparams;
+       s4            i, j;                 /* count variables                    */
+       s4            t;
+       s4            s1, s2, disp;
+       s4            funcdisp;
 
-                       M_STWU(REG_SP, REG_SP, -(24 + 1 * 4));
-            M_IST(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
+       /* get required compiler data */
 
-            a = dseg_addaddress(cd, new_classcastexception);
-            M_ALD(REG_ITMP2, REG_PV, a);
-            M_MTCTR(REG_ITMP2);
-            M_JSR;
-            M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+       m    = jd->m;
+       code = jd->code;
+       cd   = jd->cd;
+       rd   = jd->rd;
 
-                       M_ILD(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
-                       M_IADD_IMM(REG_SP, 24 + 1 * 4, REG_SP);
+       /* set some variables */
 
-                       a = dseg_addaddress(cd, asm_handle_exception);
-                       M_ALD(REG_ITMP3, REG_PV, a);
+       md = m->parseddesc;
+       nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
 
-                       M_MTCTR(REG_ITMP3);
-                       M_RTS;
-               }
-       }
+       /* calculate stackframe size */
 
-       /* generate exception check stubs */
+       cd->stackframesize =
+               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(localref_table) / SIZEOF_VOID_P +
+               4 +                             /* 4 stackframeinfo arguments (darwin)*/
+               nmd->paramcount * 2 +           /* assume all arguments are doubles   */
+               nmd->memuse;
 
-       xcodeptr = NULL;
+       /* keep stack 16-byte aligned */
 
-       for (bref = cd->xexceptionrefs; bref != NULL; bref = bref->next) {
-               if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                                         bref->branchpos,
-                                                         (u1 *) xcodeptr - (u1 *) cd->mcodebase - 4);
-                       continue;
-               }
+       cd->stackframesize = (cd->stackframesize + 3) & ~3;
 
-               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                 bref->branchpos,
-                                                 (u1 *) mcodeptr - cd->mcodebase);
+       /* create method header */
 
-               MCODECHECK(14);
+       (void) dseg_add_unique_address(cd, code);              /* CodeinfoPointer */
+       (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* FrameSize       */
+       (void) dseg_add_unique_s4(cd, 0);                      /* IsSync          */
+       (void) dseg_add_unique_s4(cd, 0);                      /* IsLeaf          */
+       (void) dseg_add_unique_s4(cd, 0);                      /* IntSave         */
+       (void) dseg_add_unique_s4(cd, 0);                      /* FltSave         */
+       (void) dseg_addlinenumbertablesize(cd);
+       (void) dseg_add_unique_s4(cd, 0);                      /* ExTableSize     */
 
-               M_LDA(REG_ITMP2_XPC, REG_PV, bref->branchpos - 4);
+       /* generate code */
 
-               if (xcodeptr != NULL) {
-                       M_BR(xcodeptr - mcodeptr - 1);
+       M_MFLR(REG_ZERO);
+       M_AST_INTERN(REG_ZERO, REG_SP, LA_LR_OFFSET);
+       M_STWU(REG_SP, REG_SP, -(cd->stackframesize * 4));
 
-               } else {
-                       xcodeptr = mcodeptr;
+       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+               emit_verbosecall_enter(jd);
 
-                       M_STWU(REG_SP, REG_SP, -(24 + 1 * 4));
-                       M_IST(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
+       /* get function address (this must happen before the stackframeinfo) */
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-            a = dseg_addaddress(cd, builtin_get_exceptionptrptr);
-            M_ALD(REG_ITMP2, REG_PV, a);
-            M_MTCTR(REG_ITMP2);
-            M_JSR;
+       funcdisp = dseg_add_functionptr(cd, f);
 
-                       /* get the exceptionptr from the ptrprt and clear it */
-            M_ALD(REG_ITMP1_XPTR, REG_RESULT, 0);
-                       M_CLR(REG_ITMP3);
-                       M_AST(REG_ITMP3, REG_RESULT, 0);
-#else
-                       a = dseg_addaddress(cd, &_exceptionptr);
-                       M_ALD(REG_ITMP2, REG_PV, a);
+#if !defined(WITH_STATIC_CLASSPATH)
+       if (f == NULL) {
+               codegen_addpatchref(cd, PATCHER_resolve_native_function, m, funcdisp);
 
-                       M_ALD(REG_ITMP1_XPTR, REG_ITMP2, 0);
-                       M_CLR(REG_ITMP3);
-                       M_AST(REG_ITMP3, REG_ITMP2, 0);
+               if (opt_showdisassemble)
+                       M_NOP;
+       }
 #endif
 
-            M_ILD(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
-            M_IADD_IMM(REG_SP, 24 + 1 * 4, REG_SP);
+       /* save integer and float argument registers */
 
-                       a = dseg_addaddress(cd, asm_handle_exception);
-                       M_ALD(REG_ITMP3, REG_PV, a);
-                       M_MTCTR(REG_ITMP3);
-                       M_RTS;
-               }
-       }
+       j = 0;
 
-       /* generate null pointer check stubs */
+       for (i = 0; i < md->paramcount; i++) {
+               t = md->paramtypes[i].type;
 
-       xcodeptr = NULL;
-
-       for (bref = cd->xnullrefs; bref != NULL; bref = bref->next) {
-               if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
-                       gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                                         bref->branchpos,
-                                                         (u1 *) xcodeptr - (u1 *) cd->mcodebase - 4);
-                       continue;
+               if (IS_INT_LNG_TYPE(t)) {
+                       if (!md->params[i].inmemory) {
+                               s1 = md->params[i].regoff;
+                               if (IS_2_WORD_TYPE(t)) {
+                                       M_IST(rd->argintregs[GET_HIGH_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+                                       j++;
+                                       M_IST(rd->argintregs[GET_LOW_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+                               } else {
+                                       M_IST(rd->argintregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+                               }
+                               j++;
+                       }
                }
+       }
 
-               gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos, 
-                                 bref->branchpos,
-                                                 (u1 *) mcodeptr - cd->mcodebase);
-
-               MCODECHECK(12);
+       for (i = 0; i < md->paramcount; i++) {
+               if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
+                       if (!md->params[i].inmemory) {
+                               s1 = md->params[i].regoff;
+                               M_DST(rd->argfltregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 8);
+                               j++;
+                       }
+               }
+       }
 
-               M_LDA(REG_ITMP2_XPC, REG_PV, bref->branchpos - 4);
+       /* create native stack info */
 
-               if (xcodeptr != NULL) {
-                       M_BR(xcodeptr - mcodeptr - 1);
+       M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[0]);
+       M_MOV(REG_PV, rd->argintregs[1]);
+       M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[2]);
+       M_ALD(rd->argintregs[3], REG_SP, cd->stackframesize * 4 + LA_LR_OFFSET);
+       disp = dseg_add_functionptr(cd, codegen_start_native_call);
+       M_ALD(REG_ITMP1, REG_PV, disp);
+       M_MTCTR(REG_ITMP1);
+       M_JSR;
 
-               } else {
-                       xcodeptr = mcodeptr;
+       /* restore integer and float argument registers */
 
-                       M_STWU(REG_SP, REG_SP, -(24 + 1 * 4));
-                       M_IST(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
+       j = 0;
 
-            a = dseg_addaddress(cd, new_nullpointerexception);
-            M_ALD(REG_ITMP2, REG_PV, a);
-            M_MTCTR(REG_ITMP2);
-            M_JSR;
-            M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+       for (i = 0; i < md->paramcount; i++) {
+               t = md->paramtypes[i].type;
 
-                       M_ILD(REG_ITMP2_XPC, REG_SP, 24 + 0 * 4);
-                       M_IADD_IMM(REG_SP, 24 + 1 * 4, REG_SP);
+               if (IS_INT_LNG_TYPE(t)) {
+                       if (!md->params[i].inmemory) {
+                               s1 = md->params[i].regoff;
 
-                       a = dseg_addaddress(cd, asm_handle_exception);
-                       M_ALD(REG_ITMP3, REG_PV, a);
-                       M_MTCTR(REG_ITMP3);
-                       M_RTS;
+                               if (IS_2_WORD_TYPE(t)) {
+                                       M_ILD(rd->argintregs[GET_HIGH_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+                                       j++;
+                                       M_ILD(rd->argintregs[GET_LOW_REG(s1)], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+                               } else {
+                                       M_ILD(rd->argintregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 4);
+                               }
+                               j++;
+                       }
                }
        }
-       }
-
-       codegen_finish(m, cd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
-
-    asm_cacheflush((void *) m->entrypoint, ((u1 *) mcodeptr - cd->mcodebase));
-}
-
-
-/* function createcompilerstub *************************************************
 
-       creates a stub routine which calls the compiler
+       for (i = 0; i < md->paramcount; i++) {
+               if (IS_FLT_DBL_TYPE(md->paramtypes[i].type)) {
+                       if (!md->params[i].inmemory) {
+                               s1 = md->params[i].regoff;
+                               M_DLD(rd->argfltregs[s1], REG_SP, LA_SIZE + 4 * 4 + j * 8);
+                               j++;
+                       }
+               }
+       }
        
-*******************************************************************************/
-
-#define COMPSTUBSIZE 6
+       /* copy or spill arguments to new locations */
 
-u1 *createcompilerstub(methodinfo *m)
-{
-       s4 *s = CNEW (s4, COMPSTUBSIZE);    /* memory to hold the stub            */
-       s4 *mcodeptr = s;                   /* code generation pointer            */
-
-       M_LDA(REG_ITMP1, REG_PV, 4*4);
-       M_ALD(REG_PV, REG_PV, 5*4);
-       M_MTCTR(REG_PV);
-       M_RTS;
-
-       s[4] = (s4) m;                      /* literals to be adressed            */
-       s[5] = (s4) asm_call_jit_compiler;  /* jump directly via PV from above    */
-
-    asm_cacheflush((void*) s, (u1*) mcodeptr - (u1*) s);
-
-#if defined(STATISTICS)
-       if (opt_stat)
-               count_cstub_len += COMPSTUBSIZE * 4;
-#endif
-
-       return (u1*) s;
-}
+       for (i = md->paramcount - 1, j = i + nativeparams; i >= 0; i--, j--) {
+               t = md->paramtypes[i].type;
 
+               if (IS_INT_LNG_TYPE(t)) {
+                       if (!md->params[i].inmemory) {
+                               if (IS_2_WORD_TYPE(t))
+                                       s1 = PACK_REGS(
+                                               rd->argintregs[GET_LOW_REG(md->params[i].regoff)],
+                                           rd->argintregs[GET_HIGH_REG(md->params[i].regoff)]);
+                               else
+                                       s1 = rd->argintregs[md->params[i].regoff];
 
-/* function removecompilerstub *************************************************
-
-     deletes a compilerstub from memory  (simply by freeing it)
+                               if (!nmd->params[j].inmemory) {
+                                       if (IS_2_WORD_TYPE(t)) {
+                                               s2 = PACK_REGS(
+                                                  rd->argintregs[GET_LOW_REG(nmd->params[j].regoff)],
+                                                  rd->argintregs[GET_HIGH_REG(nmd->params[j].regoff)]);
+                                               M_LNGMOVE(s1, s2);
+                                       } else {
+                                               s2 = rd->argintregs[nmd->params[j].regoff];
+                                               M_INTMOVE(s1, s2);
+                                       }
 
-*******************************************************************************/
+                               } else {
+                                       s2 = nmd->params[j].regoff;
+                                       if (IS_2_WORD_TYPE(t))
+                                               M_LST(s1, REG_SP, s2 * 4);
+                                       else
+                                               M_IST(s1, REG_SP, s2 * 4);
+                               }
 
-void removecompilerstub(u1 *stub) 
-{
-       CFREE(stub, COMPSTUBSIZE * 4);
-}
+                       } else {
+                               s1 = md->params[i].regoff + cd->stackframesize;
+                               s2 = nmd->params[j].regoff;
 
+                               M_ILD(REG_ITMP1, REG_SP, s1 * 4);
+                               if (IS_2_WORD_TYPE(t))
+                                       M_ILD(REG_ITMP2, REG_SP, s1 * 4 + 4);
 
-/* function: createnativestub **************************************************
+                               M_IST(REG_ITMP1, REG_SP, s2 * 4);
+                               if (IS_2_WORD_TYPE(t))
+                                       M_IST(REG_ITMP2, REG_SP, s2 * 4 + 4);
+                       }
 
-       creates a stub routine which calls a native method
+               } else {
+                       /* We only copy spilled float arguments, as the float
+                          argument registers keep unchanged. */
 
-*******************************************************************************/
+                       if (md->params[i].inmemory) {
+                               s1 = md->params[i].regoff + cd->stackframesize;
+                               s2 = nmd->params[j].regoff;
 
-#define NATIVESTUBSIZE      200
-#define NATIVESTUBOFFSET    9
+                               if (IS_2_WORD_TYPE(t)) {
+                                       M_DLD(REG_FTMP1, REG_SP, s1 * 4);
+                                       M_DST(REG_FTMP1, REG_SP, s2 * 4);
 
-u1 *createnativestub(functionptr f, methodinfo *m)
-{
-       s4 *s;                              /* memory to hold the stub            */
-       s4 *cs;
-       s4 *mcodeptr;                       /* code generation pointer            */
-       s4 stackframesize = 0;              /* size of stackframe if needed       */
-       s4 disp;
-       registerdata *rd;
-       t_inlining_globals *id;
-       s4 dumpsize;
+                               } else {
+                                       M_FLD(REG_FTMP1, REG_SP, s1 * 4);
+                                       M_FST(REG_FTMP1, REG_SP, s2 * 4);
+                               }
+                       }
+               }
+       }
 
-       /* mark start of dump memory area */
+       /* put class into second argument register */
 
-       dumpsize = dump_size();
+       if (m->flags & ACC_STATIC) {
+               disp = dseg_add_address(cd, m->class);
+               M_ALD(rd->argintregs[1], REG_PV, disp);
+       }
 
-       /* setup registers before using it */
-       
-       rd = DNEW(registerdata);
-       id = DNEW(t_inlining_globals);
+       /* put env into first argument register */
 
-       inlining_setup(m, id);
-       reg_setup(m, rd, id);
+       disp = dseg_add_address(cd, _Jv_env);
+       M_ALD(rd->argintregs[0], REG_PV, disp);
 
-       descriptor2types(m);                /* set paramcount and paramtypes      */
+       /* generate the actual native call */
 
-       s = CNEW(s4, NATIVESTUBSIZE);
-       cs = s + NATIVESTUBOFFSET;
-       mcodeptr = cs;
+       M_ALD(REG_ITMP3, REG_PV, funcdisp);
+       M_MTCTR(REG_ITMP3);
+       M_JSR;
 
-       *(cs-1) = (u4) f;                   /* address of native method           */
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       *(cs-2) = (u4) builtin_get_exceptionptrptr;
-#else
-       *(cs-2) = (u4) (&_exceptionptr);    /* address of exceptionptr            */
-#endif
-       *(cs-3) = (u4) asm_handle_nat_exception; /* addr of asm exception handler */
-       *(cs-4) = (u4) (&env);              /* addr of jni_environement           */
-       *(cs-5) = (u4) builtin_trace_args;
-       *(cs-6) = (u4) m;
-       *(cs-7) = (u4) builtin_displaymethodstop;
-       *(cs-8) = (u4) m->class;
-       *(cs-9) = (u4) asm_check_clinit;
+       /* print call trace */
 
-       M_MFLR(REG_ITMP1);
-       M_AST(REG_ITMP1, REG_SP, 8);        /* store return address               */
-       M_STWU(REG_SP, REG_SP, -64);        /* build up stackframe                */
+       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+               emit_verbosecall_exit(jd);
 
-       /* if function is static, check for initialized */
+       /* save return value */
 
-       if (m->flags & ACC_STATIC) {
-               /* if class isn't yet initialized, do it */
-               if (!m->class->initialized) {
-                       /* call helper function which patches this code */
-                       M_ALD(REG_ITMP1, REG_PV, -8 * 4);     /* class                    */
-                       M_ALD(REG_PV, REG_PV, -9 * 4);        /* asm_check_clinit         */
-                       M_MTCTR(REG_PV);
-                       M_JSR;
-                       disp = -(s4) (mcodeptr - cs) * 4;
-                       M_MFLR(REG_ITMP1);
-                       M_LDA(REG_PV, REG_ITMP1, disp);       /* recompute pv from ra     */
+       if (md->returntype.type != TYPE_VOID) {
+               if (IS_INT_LNG_TYPE(md->returntype.type)) {
+                       if (IS_2_WORD_TYPE(md->returntype.type))
+                               M_IST(REG_RESULT2, REG_SP, LA_SIZE + 2 * 4);
+                       M_IST(REG_RESULT, REG_SP, LA_SIZE + 1 * 4);
+               }
+               else {
+                       if (IS_2_WORD_TYPE(md->returntype.type))
+                               M_DST(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
+                       else
+                               M_FST(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
                }
        }
 
-       if (runverbose) {
-               s4 p, t, s1, d, a;
-        s4 longargs = 0;
-        s4 fltargs = 0;
-               s4 dblargs = 0;
-
-/*          M_MFLR(REG_ITMP3); */
-               /* XXX must be a multiple of 16 */
-        M_LDA(REG_SP, REG_SP, -(24 + (INT_ARG_CNT + FLT_ARG_CNT + 1) * 8));
-
-/*          M_IST(REG_ITMP3, REG_SP, 24 + (INT_ARG_CNT + FLT_ARG_CNT) * 8); */
-
-               M_CLR(REG_ITMP1);
-
-        /* save all arguments into the reserved stack space */
-        for (p = 0; p < m->paramcount && p < TRACE_ARGS_NUM; p++) {
-            t = m->paramtypes[p];
-
-            if (IS_INT_LNG_TYPE(t)) {
-                /* overlapping u8's are on the stack */
-                if ((p + longargs + dblargs) < (INT_ARG_CNT - IS_2_WORD_TYPE(t))) {
-                    s1 = rd->argintregs[p + longargs + dblargs];
-
-                    if (!IS_2_WORD_TYPE(t)) {
-                        M_IST(REG_ITMP1, REG_SP, 24 + p * 8);
-                        M_IST(s1, REG_SP, 24 + p * 8 + 4);
-
-                    } else {
-                        M_IST(s1, REG_SP, 24 + p  * 8);
-                        M_IST(rd->secondregs[s1], REG_SP, 24 + p * 8 + 4);
-                        longargs++;
-                    }
-
-                } else {
-                                       /* we do not have a data segment here */
-                    /* a = dseg_adds4(cd, 0xdeadbeef);
-                                          M_ILD(REG_ITMP1, REG_PV, a); */
-                                       M_LDA(REG_ITMP1, REG_ZERO, -1);
-                    M_IST(REG_ITMP1, REG_SP, 24 + p * 8);
-                    M_IST(REG_ITMP1, REG_SP, 24 + p * 8 + 4);
-                }
-
-            } else {
-                if ((fltargs + dblargs) < FLT_ARG_CNT) {
-                    s1 = rd->argfltregs[fltargs + dblargs];
-
-                    if (!IS_2_WORD_TYPE(t)) {
-                        M_IST(REG_ITMP1, REG_SP, 24 + p * 8);
-                        M_FST(s1, REG_SP, 24 + p * 8 + 4);
-                        fltargs++;
-
-                    } else {
-                        M_DST(s1, REG_SP, 24 + p * 8);
-                        dblargs++;
-                    }
-
-                } else {
-                    /* this should not happen */
-                }
-            }
-        }
-
-        /* TODO: save remaining integer and flaot argument registers */
-
-        /* load first 4 arguments into integer argument registers */
-        for (p = 0; p < 8; p++) {
-            d = rd->argintregs[p];
-            M_ILD(d, REG_SP, 24 + p * 4);
-        }
-
-        M_ALD(REG_ITMP1, REG_PV, -6 * 4);
-        M_AST(REG_ITMP1, REG_SP, 11 * 8);    /* 24 (linkage area) + 32 (4 * s8 parameter area regs) + 32 (4 * s8 parameter area stack) = 88 */
-               M_ALD(REG_ITMP2, REG_PV, -5 * 4);
-        M_MTCTR(REG_ITMP2);
-        M_JSR;
-
-        longargs = 0;
-        fltargs = 0;
-        dblargs = 0;
-
-        /* restore arguments into the reserved stack space */
-        for (p = 0; p < m->paramcount && p < TRACE_ARGS_NUM; p++) {
-            t = m->paramtypes[p];
-
-            if (IS_INT_LNG_TYPE(t)) {
-                if ((p + longargs + dblargs) < INT_ARG_CNT) {
-                    s1 = rd->argintregs[p + longargs + dblargs];
-
-                    if (!IS_2_WORD_TYPE(t)) {
-                        M_ILD(s1, REG_SP, 24 + p * 8 + 4);
-
-                    } else {
-                        M_ILD(s1, REG_SP, 24 + p  * 8);
-                        M_ILD(rd->secondregs[s1], REG_SP, 24 + p * 8 + 4);
-                        longargs++;
-                    }
-                }
-
-            } else {
-                if ((fltargs + dblargs) < FLT_ARG_CNT) {
-                    s1 = rd->argfltregs[fltargs + dblargs];
-
-                    if (!IS_2_WORD_TYPE(t)) {
-                        M_FLD(s1, REG_SP, 24 + p * 8 + 4);
-                        fltargs++;
-
-                    } else {
-                        M_DLD(s1, REG_SP, 24 + p * 8);
-                        dblargs++;
-                    }
-                }
-            }
-        }
-
-/*          M_ILD(REG_ITMP3, REG_SP, 24 + (INT_ARG_CNT + FLT_ARG_CNT) * 8); */
-
-        M_LDA(REG_SP, REG_SP, 24 + (INT_ARG_CNT + FLT_ARG_CNT + 1) * 8);
-/*          M_MTLR(REG_ITMP3); */
-       }
-
-       /* save argument registers on stack -- if we have to */
-       if ((m->flags & ACC_STATIC && m->paramcount > (INT_ARG_CNT - 2)) ||
-               m->paramcount > (INT_ARG_CNT - 1)) {
-               s4 i;
-               s4 paramshiftcnt = (m->flags & ACC_STATIC) ? 2 : 1;
-               s4 stackparamcnt = (m->paramcount > INT_ARG_CNT) ? m->paramcount - INT_ARG_CNT : 0;
-
-               stackframesize = stackparamcnt + paramshiftcnt;
-
-               M_LDA(REG_SP, REG_SP, -stackframesize * 8);
-
-               panic("nativestub");
-       }
-
-       if (m->flags & ACC_STATIC) {
-        M_MOV(rd->argintregs[5], rd->argintregs[7]);
-        M_MOV(rd->argintregs[4], rd->argintregs[6]);
-        M_MOV(rd->argintregs[3], rd->argintregs[5]);
-        M_MOV(rd->argintregs[2], rd->argintregs[4]);
-        M_MOV(rd->argintregs[1], rd->argintregs[3]);
-        M_MOV(rd->argintregs[0], rd->argintregs[2]);
-
-               /* put class into second argument register */
-               M_ALD(rd->argintregs[1], REG_PV, -8 * 4);
-
-       } else {
-               M_MOV(rd->argintregs[6], rd->argintregs[7]); 
-               M_MOV(rd->argintregs[5], rd->argintregs[6]); 
-               M_MOV(rd->argintregs[4], rd->argintregs[5]); 
-               M_MOV(rd->argintregs[3], rd->argintregs[4]);
-               M_MOV(rd->argintregs[2], rd->argintregs[3]);
-               M_MOV(rd->argintregs[1], rd->argintregs[2]);
-               M_MOV(rd->argintregs[0], rd->argintregs[1]);
-       }
-
-       /* put env into first argument register */
-       M_ALD(rd->argintregs[0], REG_PV, -4 * 4);
+       /* remove native stackframe info */
 
-       M_ALD(REG_PV, REG_PV, -1 * 4);      /* load adress of native method       */
-       M_MTCTR(REG_PV);
+       M_AADD_IMM(REG_SP, cd->stackframesize * 4, rd->argintregs[0]);
+       disp = dseg_add_functionptr(cd, codegen_finish_native_call);
+       M_ALD(REG_ITMP1, REG_PV, disp);
+       M_MTCTR(REG_ITMP1);
        M_JSR;
-       disp = -(s4) (mcodeptr - cs) * 4;
-       M_MFLR(REG_ITMP1);
-       M_LDA(REG_PV, REG_ITMP1, disp);     /* recompute pv from ra               */
-
-       /* remove stackframe if there is one */
-       if (stackframesize) {
-               M_LDA(REG_SP, REG_SP, stackframesize * 8);
-       }
-
-       /* 20 instructions */
-       if (runverbose) {
-               M_MFLR(REG_ITMP3);
-               M_LDA(REG_SP, REG_SP, -10 * 8);
-               M_DST(REG_FRESULT, REG_SP, 48+0);
-               M_IST(REG_RESULT, REG_SP, 48+8);
-               M_AST(REG_ITMP3, REG_SP, 48+12);
-               M_IST(REG_RESULT2, REG_SP, 48+16);
+       M_MOV(REG_RESULT, REG_ITMP1_XPTR);
 
-               /* keep this order */
-               switch (m->returntype) {
-               case TYPE_INT:
-               case TYPE_ADDRESS:
-                       M_MOV(REG_RESULT, rd->argintregs[2]);
-                       M_CLR(rd->argintregs[1]);
-                       break;
+       /* restore return value */
 
-               case TYPE_LONG:
-                       M_MOV(REG_RESULT2, rd->argintregs[2]);
-                       M_MOV(REG_RESULT, rd->argintregs[1]);
-                       break;
+       if (md->returntype.type != TYPE_VOID) {
+               if (IS_INT_LNG_TYPE(md->returntype.type)) {
+                       if (IS_2_WORD_TYPE(md->returntype.type))
+                               M_ILD(REG_RESULT2, REG_SP, LA_SIZE + 2 * 4);
+                       M_ILD(REG_RESULT, REG_SP, LA_SIZE + 1 * 4);
+               }
+               else {
+                       if (IS_2_WORD_TYPE(md->returntype.type))
+                               M_DLD(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
+                       else
+                               M_FLD(REG_FRESULT, REG_SP, LA_SIZE + 1 * 4);
                }
-               M_ALD(rd->argintregs[0], REG_PV, -6 * 4);
-
-               M_FLTMOVE(REG_FRESULT, rd->argfltregs[0]);
-               M_FLTMOVE(REG_FRESULT, rd->argfltregs[1]);
-               M_ALD(REG_ITMP2, REG_PV, -7 * 4);/* builtin_displaymethodstop         */
-               M_MTCTR(REG_ITMP2);
-               M_JSR;
-               M_DLD(REG_FRESULT, REG_SP, 48+0);
-               M_ILD(REG_RESULT, REG_SP, 48+8);
-               M_ALD(REG_ITMP3, REG_SP, 48+12);
-               M_ILD(REG_RESULT2, REG_SP, 48+16);
-               M_LDA(REG_SP, REG_SP, 10 * 8);
-               M_MTLR(REG_ITMP3);
        }
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       if (IS_FLT_DBL_TYPE(m->returntype))
-               if (IS_2_WORD_TYPE(m->returntype))
-                       M_DST(REG_FRESULT, REG_SP, 56);
-               else
-                       M_FST(REG_FRESULT, REG_SP, 56);
-       else {
-               M_IST(REG_RESULT, REG_SP, 56);
-               if (IS_2_WORD_TYPE(m->returntype))
-                       M_IST(REG_RESULT2, REG_SP, 60);
-       }
+       M_ALD(REG_ITMP2_XPC, REG_SP, cd->stackframesize * 4 + LA_LR_OFFSET);
+       M_MTLR(REG_ITMP2_XPC);
+       M_LDA(REG_SP, REG_SP, cd->stackframesize * 4); /* remove stackframe       */
 
-       M_ALD(REG_ITMP2, REG_PV, -2 * 4);   /* builtin_get_exceptionptrptr        */
-       M_MTCTR(REG_ITMP2);
-       M_JSR;
-       disp = -(s4) (mcodeptr - (s4 *) cs) * 4;
-       M_MFLR(REG_ITMP1);
-       M_LDA(REG_PV, REG_ITMP1, disp);
-       M_MOV(REG_RESULT, REG_ITMP2);
-
-       if (IS_FLT_DBL_TYPE(m->returntype))
-               if (IS_2_WORD_TYPE(m->returntype))
-                       M_DLD(REG_FRESULT, REG_SP, 56);
-               else
-                       M_FLD(REG_FRESULT, REG_SP, 56);
-       else {
-               M_ILD(REG_RESULT, REG_SP, 56);
-               if (IS_2_WORD_TYPE(m->returntype))
-                       M_ILD(REG_RESULT2, REG_SP, 60);
-       }
-#else
-       M_ALD(REG_ITMP2, REG_PV, -2 * 4);   /* get address of exceptionptr        */
-#endif
-       M_ALD(REG_ITMP1, REG_ITMP2, 0);     /* load exception into reg. itmp1     */
-       M_TST(REG_ITMP1);
-       M_BNE(4);                           /* if no exception then return        */
+       /* check for exception */
 
-       M_ALD(REG_ITMP1, REG_SP, 64 + 8);   /* load return address                */
-       M_MTLR(REG_ITMP1);
-       M_LDA(REG_SP, REG_SP, 64);          /* remove stackframe                  */
+       M_TST(REG_ITMP1_XPTR);
+       M_BNE(1);                           /* if no exception then return        */
 
        M_RET;
-       
-       M_CLR(REG_ITMP3);
-       M_AST(REG_ITMP3, REG_ITMP2, 0);     /* store NULL into exceptionptr       */
 
-       M_ALD(REG_ITMP3, REG_SP, 64 + 8);   /* load return address                */
-       M_MTLR(REG_ITMP3);
-       M_LDA(REG_SP, REG_SP, 64);          /* remove stackframe                  */
+       /* handle exception */
 
-       M_LDA(REG_ITMP2, REG_ITMP1, -4);    /* move fault address into reg. itmp2 */
+       M_IADD_IMM(REG_ITMP2_XPC, -4, REG_ITMP2_XPC);  /* exception address       */
 
-       M_ALD(REG_ITMP3, REG_PV, -3 * 4);   /* load asm exception handler address */
+       disp = dseg_add_functionptr(cd, asm_handle_nat_exception);
+       M_ALD(REG_ITMP3, REG_PV, disp);
        M_MTCTR(REG_ITMP3);
        M_RTS;
-       
-#if 0
-       dolog_plain("stubsize: %d (for %d params)\n", (int) (mcodeptr - (s4 *) s), m->paramcount);
-#endif
-
-    asm_cacheflush((void *) s, (u1*) mcodeptr - (u1*) s);
-
-#if defined(STATISTICS)
-       if (opt_stat)
-               count_nstub_len += NATIVESTUBSIZE * 4;
-#endif
-
-       /* release dump area */
-
-       dump_release(dumpsize);
-
-       return (u1*) (s + NATIVESTUBOFFSET);
-}
 
+       /* generate patcher stubs */
 
-/* function: removenativestub **************************************************
+       emit_patcher_stubs(jd);
 
-    removes a previously created native-stub from memory
-    
-*******************************************************************************/
+       codegen_finish(jd);
 
-void removenativestub(u1 *stub)
-{
-       CFREE((s4 *) stub - NATIVESTUBOFFSET, NATIVESTUBSIZE * 4);
+       return code->entrypoint;
 }
 
 
@@ -3674,4 +3867,5 @@ void removenativestub(u1 *stub)
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */