Fix a warning.
[mono.git] / mono / mini / mini-sparc.c
old mode 100644 (file)
new mode 100755 (executable)
index 67b0cdd..21c2b0c
@@ -18,7 +18,6 @@
 #include <unistd.h>
 
 #ifndef __linux__
-#include <sys/systeminfo.h>
 #include <thread.h>
 #endif
 
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/tokentype.h>
 #include <mono/utils/mono-math.h>
+#include <mono/utils/mono-hwcap-sparc.h>
 
 #include "mini-sparc.h"
-#include "inssel.h"
 #include "trace.h"
 #include "cpu-sparc.h"
 #include "jit-icalls.h"
+#include "ir-emit.h"
 
 /*
  * Sparc V9 means two things:
 
 #endif
 
-/* Whenever the CPU supports v9 instructions */
-static gboolean sparcv9 = FALSE;
-
 /* Whenever this is a 64bit executable */
 #if SPARCV9
 static gboolean v64 = TRUE;
@@ -162,9 +159,6 @@ static gboolean v64 = FALSE;
 
 static gpointer mono_arch_get_lmf_addr (void);
 
-static int
-mono_spillvar_offset_float (MonoCompile *cfg, int spillvar);
-
 const char*
 mono_arch_regname (int reg) {
        static const char * rnames[] = {
@@ -205,9 +199,6 @@ mono_arch_fregname (int reg) {
 void
 mono_arch_cpu_init (void)
 {
-       guint32 dummy;
-       /* make sure sparcv9 is initialized for embedded use */
-       mono_arch_cpu_optimizazions(&dummy);
 }
 
 /*
@@ -230,43 +221,37 @@ mono_arch_cleanup (void)
  * This function returns the optimizations supported on this cpu.
  */
 guint32
-mono_arch_cpu_optimizazions (guint32 *exclude_mask)
+mono_arch_cpu_optimizations (guint32 *exclude_mask)
 {
-       char buf [1024];
        guint32 opts = 0;
 
        *exclude_mask = 0;
 
-#ifndef __linux__
-       if (!sysinfo (SI_ISALIST, buf, 1024))
-               g_assert_not_reached ();
-#else
-       /* From glibc.  If the getpagesize is 8192, we're on sparc64, which
-        * (in)directly implies that we're a v9 or better.
-        * Improvements to this are greatly accepted...
-        * Also, we don't differentiate between v7 and v8.  I sense SIGILL
-        * sniffing in my future.  
-        */
-       if (getpagesize() == 8192)
-               strcpy (buf, "sparcv9");
-       else
-               strcpy (buf, "sparcv8");
-#endif
-
-       /* 
+       /*
         * On some processors, the cmov instructions are even slower than the
         * normal ones...
         */
-       if (strstr (buf, "sparcv9")) {
+       if (mono_hwcap_sparc_is_v9)
                opts |= MONO_OPT_CMOV | MONO_OPT_FCMOV;
-               sparcv9 = TRUE;
-       }
        else
                *exclude_mask |= MONO_OPT_CMOV | MONO_OPT_FCMOV;
 
        return opts;
 }
 
+/*
+ * This function test for all SIMD functions supported.
+ *
+ * Returns a bitmask corresponding to all supported versions.
+ *
+ */
+guint32
+mono_arch_cpu_enumerate_simd_versions (void)
+{
+       /* SIMD is currently unimplemented */
+       return 0;
+}
+
 #ifdef __GNUC__
 #define flushi(addr)    __asm__ __volatile__ ("iflush %0"::"r"(addr):"memory")
 #else /* assume Sun's compiler */
@@ -296,7 +281,7 @@ mono_arch_flush_icache (guint8 *code, gint size)
         *
         * Sparcv8 needs a flush every 8 bytes.
         */
-       align = (sparcv9 ? 32 : 8);
+       align = (mono_hwcap_sparc_is_v9 ? 32 : 8);
 
        start &= ~(align - 1);
        end = (end + (align - 1)) & ~(align - 1);
@@ -360,7 +345,7 @@ mono_arch_is_inst_imm (gint64 imm)
 
 gboolean 
 mono_sparc_is_v9 (void) {
-       return sparcv9;
+       return mono_hwcap_sparc_is_v9;
 }
 
 gboolean 
@@ -507,6 +492,8 @@ get_call_info (MonoCompile *cfg, MonoMethodSignature *sig, gboolean is_pinvoke)
                /* The address of the return value is passed in %o0 */
                add_general (&gr, &stack_size, &cinfo->ret, FALSE);
                cinfo->ret.reg += sparc_i0;
+               /* FIXME: Pass this after this as on other platforms */
+               NOT_IMPLEMENTED;
        }
 #endif
 
@@ -574,7 +561,7 @@ get_call_info (MonoCompile *cfg, MonoMethodSignature *sig, gboolean is_pinvoke)
                        add_general (&gr, &stack_size, ainfo, FALSE);
                        break;
                case MONO_TYPE_GENERICINST:
-                       if (!mono_type_generic_inst_is_valuetype (sig->params [i])) {
+                       if (!mono_type_generic_inst_is_valuetype (ptype)) {
                                add_general (&gr, &stack_size, ainfo, FALSE);
                                break;
                        }
@@ -673,7 +660,7 @@ get_call_info (MonoCompile *cfg, MonoMethodSignature *sig, gboolean is_pinvoke)
                cinfo->ret.reg = sparc_f0;
                break;
        case MONO_TYPE_GENERICINST:
-               if (!mono_type_generic_inst_is_valuetype (sig->ret)) {
+               if (!mono_type_generic_inst_is_valuetype (ret_type)) {
                        cinfo->ret.storage = ArgInIReg;
                        cinfo->ret.reg = sparc_i0;
                        if (gr < 1)
@@ -791,8 +778,9 @@ mono_arch_regalloc_cost (MonoCompile *cfg, MonoMethodVar *vmv)
  * Set var information according to the calling convention. sparc version.
  * The locals var stuff should most likely be split in another method.
  */
+
 void
-mono_arch_allocate_vars (MonoCompile *m)
+mono_arch_allocate_vars (MonoCompile *cfg)
 {
        MonoMethodSignature *sig;
        MonoMethodHeader *header;
@@ -800,34 +788,48 @@ mono_arch_allocate_vars (MonoCompile *m)
        int i, offset, size, align, curinst;
        CallInfo *cinfo;
 
-       header = mono_method_get_header (m->method);
+       header = cfg->header;
 
-       sig = mono_method_signature (m->method);
+       sig = mono_method_signature (cfg->method);
 
-       cinfo = get_call_info (m, sig, FALSE);
+       cinfo = get_call_info (cfg, sig, FALSE);
 
        if (sig->ret->type != MONO_TYPE_VOID) {
                switch (cinfo->ret.storage) {
                case ArgInIReg:
                case ArgInFReg:
-               case ArgInIRegPair:
-                       m->ret->opcode = OP_REGVAR;
-                       m->ret->inst_c0 = cinfo->ret.reg;
+                       cfg->ret->opcode = OP_REGVAR;
+                       cfg->ret->inst_c0 = cinfo->ret.reg;
+                       break;
+               case ArgInIRegPair: {
+                       MonoType *t = mono_type_get_underlying_type (sig->ret);
+                       if (((t->type == MONO_TYPE_I8) || (t->type == MONO_TYPE_U8))) {
+                               MonoInst *low = get_vreg_to_inst (cfg, cfg->ret->dreg + 1);
+                               MonoInst *high = get_vreg_to_inst (cfg, cfg->ret->dreg + 2);
+
+                               low->opcode = OP_REGVAR;
+                               low->dreg = cinfo->ret.reg + 1;
+                               high->opcode = OP_REGVAR;
+                               high->dreg = cinfo->ret.reg;
+                       }
+                       cfg->ret->opcode = OP_REGVAR;
+                       cfg->ret->inst_c0 = cinfo->ret.reg;
                        break;
+               }
                case ArgOnStack:
 #ifdef SPARCV9
                        g_assert_not_reached ();
 #else
                        /* valuetypes */
-                       m->ret->opcode = OP_REGOFFSET;
-                       m->ret->inst_basereg = sparc_fp;
-                       m->ret->inst_offset = 64;
+                       cfg->vret_addr->opcode = OP_REGOFFSET;
+                       cfg->vret_addr->inst_basereg = sparc_fp;
+                       cfg->vret_addr->inst_offset = 64;
 #endif
                        break;
                default:
                        NOT_IMPLEMENTED;
                }
-               m->ret->dreg = m->ret->inst_c0;
+               cfg->ret->dreg = cfg->ret->inst_c0;
        }
 
        /*
@@ -837,7 +839,7 @@ mono_arch_allocate_vars (MonoCompile *m)
         */
 
        /* Locals are allocated backwards from %fp */
-       m->frame_reg = sparc_fp;
+       cfg->frame_reg = sparc_fp;
        offset = 0;
 
        /* 
@@ -847,16 +849,16 @@ mono_arch_allocate_vars (MonoCompile *m)
        if (header->num_clauses)
                offset += sizeof (gpointer) * 2;
 
-       if (m->method->save_lmf) {
+       if (cfg->method->save_lmf) {
                offset += sizeof (MonoLMF);
-               m->arch.lmf_offset = offset;
+               cfg->arch.lmf_offset = offset;
        }
 
-       curinst = m->locals_start;
-       for (i = curinst; i < m->num_varinfo; ++i) {
-               inst = m->varinfo [i];
+       curinst = cfg->locals_start;
+       for (i = curinst; i < cfg->num_varinfo; ++i) {
+               inst = cfg->varinfo [i];
 
-               if (inst->opcode == OP_REGVAR) {
+               if ((inst->opcode == OP_REGVAR) || (inst->opcode == OP_REGOFFSET)) {
                        //g_print ("allocating local %d to %s\n", i, mono_arch_regname (inst->dreg));
                        continue;
                }
@@ -867,9 +869,9 @@ mono_arch_allocate_vars (MonoCompile *m)
                /* inst->backend.is_pinvoke indicates native sized value types, this is used by the
                * pinvoke wrappers when they call functions returning structure */
                if (inst->backend.is_pinvoke && MONO_TYPE_ISSTRUCT (inst->inst_vtype) && inst->inst_vtype->type != MONO_TYPE_TYPEDBYREF)
-                       size = mono_class_native_size (inst->inst_vtype->data.klass, &align);
+                       size = mono_class_native_size (mono_class_from_mono_type (inst->inst_vtype), &align);
                else
-                       size = mini_type_stack_size (m->generic_sharing_context, inst->inst_vtype, &align);
+                       size = mini_type_stack_size (cfg->generic_sharing_context, inst->inst_vtype, &align);
 
                /* 
                 * This is needed since structures containing doubles must be doubleword 
@@ -895,11 +897,11 @@ mono_arch_allocate_vars (MonoCompile *m)
        }
 
        if (sig->call_convention == MONO_CALL_VARARG) {
-               m->sig_cookie = cinfo->sig_cookie.offset + ARGS_OFFSET;
+               cfg->sig_cookie = cinfo->sig_cookie.offset + ARGS_OFFSET;
        }
 
        for (i = 0; i < sig->param_count + sig->hasthis; ++i) {
-               inst = m->args [i];
+               inst = cfg->args [i];
                if (inst->opcode != OP_REGVAR) {
                        ArgInfo *ainfo = &cinfo->args [i];
                        gboolean inreg = TRUE;
@@ -922,6 +924,7 @@ mono_arch_allocate_vars (MonoCompile *m)
 #endif
 
                        /* FIXME: Allocate volatile arguments to registers */
+                       /* FIXME: This makes the argument holding a vtype address into volatile */
                        if (inst->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT))
                                inreg = FALSE;
 
@@ -938,7 +941,19 @@ mono_arch_allocate_vars (MonoCompile *m)
 
                        switch (storage) {
                        case ArgInIReg:
+                               inst->opcode = OP_REGVAR;
+                               inst->dreg = sparc_i0 + ainfo->reg;
+                               break;
                        case ArgInIRegPair:
+                               if (inst->type == STACK_I8) {
+                                       MonoInst *low = get_vreg_to_inst (cfg, inst->dreg + 1);
+                                       MonoInst *high = get_vreg_to_inst (cfg, inst->dreg + 2);
+
+                                       low->opcode = OP_REGVAR;
+                                       low->dreg = sparc_i0 + ainfo->reg + 1;
+                                       high->opcode = OP_REGVAR;
+                                       high->dreg = sparc_i0 + ainfo->reg;
+                               }
                                inst->opcode = OP_REGVAR;
                                inst->dreg = sparc_i0 + ainfo->reg;
                                break;
@@ -986,9 +1001,9 @@ mono_arch_allocate_vars (MonoCompile *m)
                                 * are destructively modified in a lot of places in inssel.brg.
                                 */
                                MonoInst *indir;
-                               MONO_INST_NEW (m, indir, 0);
+                               MONO_INST_NEW (cfg, indir, 0);
                                *indir = *inst;
-                               inst->opcode = OP_SPARC_INARG_VT;
+                               inst->opcode = OP_VTARG_ADDR;
                                inst->inst_left = indir;
                        }
                }
@@ -999,34 +1014,241 @@ mono_arch_allocate_vars (MonoCompile *m)
         * by the ABI.
         */
 
-       m->stack_offset = offset;
+       cfg->stack_offset = offset;
+
+       g_free (cinfo);
+}
+
+void
+mono_arch_create_vars (MonoCompile *cfg)
+{
+       MonoMethodSignature *sig;
+
+       sig = mono_method_signature (cfg->method);
+
+       if (MONO_TYPE_ISSTRUCT ((sig->ret))) {
+               cfg->vret_addr = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_ARG);
+               if (G_UNLIKELY (cfg->verbose_level > 1)) {
+                       printf ("vret_addr = ");
+                       mono_print_ins (cfg->vret_addr);
+               }
+       }
+
+       if (!sig->ret->byref && (sig->ret->type == MONO_TYPE_I8 || sig->ret->type == MONO_TYPE_U8)) {
+               MonoInst *low = get_vreg_to_inst (cfg, cfg->ret->dreg + 1);
+               MonoInst *high = get_vreg_to_inst (cfg, cfg->ret->dreg + 2);
+
+               low->flags |= MONO_INST_VOLATILE;
+               high->flags |= MONO_INST_VOLATILE;
+       }
 
        /* Add a properly aligned dword for use by int<->float conversion opcodes */
-       m->spill_count ++;
-       mono_spillvar_offset_float (m, 0);
+       cfg->arch.float_spill_slot = mono_compile_create_var (cfg, &mono_defaults.double_class->byval_arg, OP_ARG);
+       ((MonoInst*)cfg->arch.float_spill_slot)->flags |= MONO_INST_VOLATILE;
+}
 
-       g_free (cinfo);
+static void
+add_outarg_reg (MonoCompile *cfg, MonoCallInst *call, ArgStorage storage, int reg, guint32 sreg)
+{
+       MonoInst *arg;
+
+       MONO_INST_NEW (cfg, arg, 0);
+
+       arg->sreg1 = sreg;
+
+       switch (storage) {
+       case ArgInIReg:
+               arg->opcode = OP_MOVE;
+               arg->dreg = mono_alloc_ireg (cfg);
+
+               mono_call_inst_add_outarg_reg (cfg, call, arg->dreg, reg, FALSE);
+               break;
+       case ArgInFloatReg:
+               arg->opcode = OP_FMOVE;
+               arg->dreg = mono_alloc_freg (cfg);
+
+               mono_call_inst_add_outarg_reg (cfg, call, arg->dreg, reg, TRUE);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+
+       MONO_ADD_INS (cfg->cbb, arg);
 }
 
-static MonoInst *
-make_group (MonoCompile *cfg, MonoInst *left, int basereg, int offset)
+static void
+add_outarg_load (MonoCompile *cfg, MonoCallInst *call, int opcode, int basereg, int offset, int reg)
 {
-       MonoInst *group;
+       int dreg = mono_alloc_ireg (cfg);
 
-       MONO_INST_NEW (cfg, group, OP_GROUP);
-       group->inst_left = left;
-       group->inst_basereg = basereg;
-       group->inst_imm = offset;
+    MONO_EMIT_NEW_LOAD_MEMBASE (cfg, dreg, sparc_sp, offset);
 
-       return group;
+       mono_call_inst_add_outarg_reg (cfg, call, dreg, reg, FALSE);
 }
 
 static void
-emit_sig_cookie (MonoCompile *cfg, MonoCallInst *call, CallInfo *cinfo)
+emit_pass_long (MonoCompile *cfg, MonoCallInst *call, ArgInfo *ainfo, MonoInst *in)
+{
+       int offset = ARGS_OFFSET + ainfo->offset;
+
+       switch (ainfo->storage) {
+       case ArgInIRegPair:
+               add_outarg_reg (cfg, call, ArgInIReg, sparc_o0 + ainfo->reg + 1, in->dreg + 1);
+               add_outarg_reg (cfg, call, ArgInIReg, sparc_o0 + ainfo->reg, in->dreg + 2);
+               break;
+       case ArgOnStackPair:
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI4_MEMBASE_REG, sparc_sp, offset, in->dreg + 2);
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI4_MEMBASE_REG, sparc_sp, offset + 4, in->dreg + 1);
+               break;
+       case ArgInSplitRegStack:
+               add_outarg_reg (cfg, call, ArgInIReg, sparc_o0 + ainfo->reg, in->dreg + 2);
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI4_MEMBASE_REG, sparc_sp, offset + 4, in->dreg + 1);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+}
+
+static void
+emit_pass_double (MonoCompile *cfg, MonoCallInst *call, ArgInfo *ainfo, MonoInst *in)
+{
+       int offset = ARGS_OFFSET + ainfo->offset;
+
+       switch (ainfo->storage) {
+       case ArgInIRegPair:
+               /* floating-point <-> integer transfer must go through memory */
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORER8_MEMBASE_REG, sparc_sp, offset, in->dreg);
+
+               /* Load into a register pair */
+               add_outarg_load (cfg, call, OP_LOADI4_MEMBASE, sparc_sp, offset, sparc_o0 + ainfo->reg);
+               add_outarg_load (cfg, call, OP_LOADI4_MEMBASE, sparc_sp, offset + 4, sparc_o0 + ainfo->reg + 1);
+               break;
+       case ArgOnStackPair:
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORER8_MEMBASE_REG, sparc_sp, offset, in->dreg);
+               break;
+       case ArgInSplitRegStack:
+               /* floating-point <-> integer transfer must go through memory */
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORER8_MEMBASE_REG, sparc_sp, offset, in->dreg);
+               /* Load most significant word into register */
+               add_outarg_load (cfg, call, OP_LOADI4_MEMBASE, sparc_sp, offset, sparc_o0 + ainfo->reg);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+}
+
+static void
+emit_pass_float (MonoCompile *cfg, MonoCallInst *call, ArgInfo *ainfo, MonoInst *in)
+{
+       int offset = ARGS_OFFSET + ainfo->offset;
+
+       switch (ainfo->storage) {
+       case ArgInIReg:
+               /* floating-point <-> integer transfer must go through memory */
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORER4_MEMBASE_REG, sparc_sp, offset, in->dreg);
+               add_outarg_load (cfg, call, OP_LOADI4_MEMBASE, sparc_sp, offset, sparc_o0 + ainfo->reg);
+               break;
+       case ArgOnStack:
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORER4_MEMBASE_REG, sparc_sp, offset, in->dreg);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+}
+
+static void
+emit_pass_other (MonoCompile *cfg, MonoCallInst *call, ArgInfo *ainfo, MonoType *arg_type, MonoInst *in);
+
+static void
+emit_pass_vtype (MonoCompile *cfg, MonoCallInst *call, CallInfo *cinfo, ArgInfo *ainfo, MonoType *arg_type, MonoInst *in, gboolean pinvoke)
 {
        MonoInst *arg;
+       guint32 align, offset, pad, size;
+
+       if (arg_type->type == MONO_TYPE_TYPEDBYREF) {
+               size = sizeof (MonoTypedRef);
+               align = sizeof (gpointer);
+       }
+       else if (pinvoke)
+               size = mono_type_native_stack_size (&in->klass->byval_arg, &align);
+       else {
+               /* 
+                * Other backends use mono_type_stack_size (), but that
+                * aligns the size to 8, which is larger than the size of
+                * the source, leading to reads of invalid memory if the
+                * source is at the end of address space.
+                */
+               size = mono_class_value_size (in->klass, &align);
+       }
+
+       /* The first 6 argument locations are reserved */
+       if (cinfo->stack_usage < 6 * sizeof (gpointer))
+               cinfo->stack_usage = 6 * sizeof (gpointer);
+
+       offset = ALIGN_TO ((ARGS_OFFSET - STACK_BIAS) + cinfo->stack_usage, align);
+       pad = offset - ((ARGS_OFFSET - STACK_BIAS) + cinfo->stack_usage);
+
+       cinfo->stack_usage += size;
+       cinfo->stack_usage += pad;
+
+       /* 
+        * We use OP_OUTARG_VT to copy the valuetype to a stack location, then
+        * use the normal OUTARG opcodes to pass the address of the location to
+        * the callee.
+        */
+       if (size > 0) {
+               MONO_INST_NEW (cfg, arg, OP_OUTARG_VT);
+               arg->sreg1 = in->dreg;
+               arg->klass = in->klass;
+               arg->backend.size = size;
+               arg->inst_p0 = call;
+               arg->inst_p1 = mono_mempool_alloc (cfg->mempool, sizeof (ArgInfo));
+               memcpy (arg->inst_p1, ainfo, sizeof (ArgInfo));
+               ((ArgInfo*)(arg->inst_p1))->offset = STACK_BIAS + offset;
+               MONO_ADD_INS (cfg->cbb, arg);
+
+               MONO_INST_NEW (cfg, arg, OP_ADD_IMM);
+               arg->dreg = mono_alloc_preg (cfg);
+               arg->sreg1 = sparc_sp;
+               arg->inst_imm = STACK_BIAS + offset;
+               MONO_ADD_INS (cfg->cbb, arg);
+
+               emit_pass_other (cfg, call, ainfo, NULL, arg);
+       }
+}
+
+static void
+emit_pass_other (MonoCompile *cfg, MonoCallInst *call, ArgInfo *ainfo, MonoType *arg_type, MonoInst *in)
+{
+       int offset = ARGS_OFFSET + ainfo->offset;
+       int opcode;
+
+       switch (ainfo->storage) {
+       case ArgInIReg:
+               add_outarg_reg (cfg, call, ArgInIReg, sparc_o0 + ainfo->reg, in->dreg);
+               break;
+       case ArgOnStack:
+#ifdef SPARCV9
+               NOT_IMPLEMENTED;
+#else
+               if (offset & 0x1)
+                       opcode = OP_STOREI1_MEMBASE_REG;
+               else if (offset & 0x2)
+                       opcode = OP_STOREI2_MEMBASE_REG;
+               else
+                       opcode = OP_STOREI4_MEMBASE_REG;
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, opcode, sparc_sp, offset, in->dreg);
+#endif
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+}
+
+static void
+emit_sig_cookie (MonoCompile *cfg, MonoCallInst *call, CallInfo *cinfo)
+{
        MonoMethodSignature *tmp_sig;
-       MonoInst *sig_arg;
 
        /*
         * mono_ArgIterator_Setup assumes the signature cookie is 
@@ -1042,24 +1264,13 @@ emit_sig_cookie (MonoCompile *cfg, MonoCallInst *call, CallInfo *cinfo)
        /* FIXME: Add support for signature tokens to AOT */
        cfg->disable_aot = TRUE;
        /* We allways pass the signature on the stack for simplicity */
-       MONO_INST_NEW (cfg, arg, OP_SPARC_OUTARG_MEM);
-       arg->inst_right = make_group (cfg, (MonoInst*)call, sparc_sp, ARGS_OFFSET + cinfo->sig_cookie.offset);
-       MONO_INST_NEW (cfg, sig_arg, OP_ICONST);
-       sig_arg->inst_p0 = tmp_sig;
-       arg->inst_left = sig_arg;
-       arg->type = STACK_PTR;
-       MONO_INST_LIST_ADD_TAIL (&arg->node, &call->out_args);
+       MONO_EMIT_NEW_STORE_MEMBASE_IMM (cfg, OP_STORE_MEMBASE_IMM, sparc_sp, ARGS_OFFSET + cinfo->sig_cookie.offset, tmp_sig);
 }
 
-/* 
- * take the arguments and generate the arch-specific
- * instructions to properly call the function in call.
- * This includes pushing, moving arguments to the right register
- * etc.
- */
-MonoCallInst*
-mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call, int is_virtual) {
-       MonoInst *arg, *in;
+void
+mono_arch_emit_call (MonoCompile *cfg, MonoCallInst *call)
+{
+       MonoInst *in;
        MonoMethodSignature *sig;
        int i, n;
        CallInfo *cinfo;
@@ -1071,7 +1282,14 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
        
        cinfo = get_call_info (cfg, sig, sig->pinvoke);
 
+       if (sig->ret && MONO_TYPE_ISSTRUCT (sig->ret)) {
+               /* Set the 'struct/union return pointer' location on the stack */
+               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI4_MEMBASE_REG, sparc_sp, 64, call->vret_var->dreg);
+       }
+
        for (i = 0; i < n; ++i) {
+               MonoType *arg_type;
+
                ainfo = cinfo->args + i;
 
                if ((sig->call_convention == MONO_CALL_VARARG) && (i == sig->sentinelpos)) {
@@ -1079,118 +1297,24 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
                        emit_sig_cookie (cfg, call, cinfo);
                }
 
-               if (is_virtual && i == 0) {
-                       /* the argument will be attached to the call instruction */
-                       in = call->args [i];
-               } else {
-                       MONO_INST_NEW (cfg, arg, OP_OUTARG);
-                       in = call->args [i];
-                       arg->cil_code = in->cil_code;
-                       arg->inst_left = in;
-                       arg->type = in->type;
-                       MONO_INST_LIST_ADD_TAIL (&arg->node, &call->out_args);
-
-                       if ((i >= sig->hasthis) && (MONO_TYPE_ISSTRUCT(sig->params [i - sig->hasthis]))) {
-                               MonoInst *inst;
-                               gint align;
-                               guint32 offset, pad;
-                               guint32 size;
-
-#ifdef SPARCV9
-                               if (sig->pinvoke)
-                                       NOT_IMPLEMENTED;
-#endif
-
-                               if (sig->params [i - sig->hasthis]->type == MONO_TYPE_TYPEDBYREF) {
-                                       size = sizeof (MonoTypedRef);
-                                       align = sizeof (gpointer);
-                               }
-                               else
-                               if (sig->pinvoke)
-                                       size = mono_type_native_stack_size (&in->klass->byval_arg, &align);
-                               else {
-                                       /* 
-                                        * Can't use mini_type_stack_size (), but that
-                                        * aligns the size to sizeof (gpointer), which is larger 
-                                        * than the size of the source, leading to reads of invalid
-                                        * memory if the source is at the end of address space or
-                                        * misaligned reads.
-                                        */
-                                       size = mono_class_value_size (in->klass, &align);
-                               }
-
-                               /* 
-                                * We use OP_OUTARG_VT to copy the valuetype to a stack location, then
-                                * use the normal OUTARG opcodes to pass the address of the location to
-                                * the callee.
-                                */
-                               MONO_INST_NEW (cfg, inst, OP_OUTARG_VT);
-                               inst->inst_left = in;
-
-                               /* The first 6 argument locations are reserved */
-                               if (cinfo->stack_usage < 6 * sizeof (gpointer))
-                                       cinfo->stack_usage = 6 * sizeof (gpointer);
-
-                               offset = ALIGN_TO ((ARGS_OFFSET - STACK_BIAS) + cinfo->stack_usage, align);
-                               pad = offset - ((ARGS_OFFSET - STACK_BIAS) + cinfo->stack_usage);
-
-                               inst->inst_c1 = STACK_BIAS + offset;
-                               inst->backend.size = size;
-                               arg->inst_left = inst;
-
-                               cinfo->stack_usage += size;
-                               cinfo->stack_usage += pad;
-                       }
+               in = call->args [i];
 
-                       arg->inst_right = make_group (cfg, (MonoInst*)call, sparc_sp, ARGS_OFFSET + ainfo->offset);
-
-                       switch (ainfo->storage) {
-                       case ArgInIReg:
-                       case ArgInFReg:
-                       case ArgInIRegPair:
-                               if (ainfo->storage == ArgInIRegPair)
-                                       arg->opcode = OP_SPARC_OUTARG_REGPAIR;
-                               arg->backend.reg3 = sparc_o0 + ainfo->reg;
-                               call->used_iregs |= 1 << ainfo->reg;
-
-                               if ((i >= sig->hasthis) && !sig->params [i - sig->hasthis]->byref && ((sig->params [i - sig->hasthis]->type == MONO_TYPE_R8) || (sig->params [i - sig->hasthis]->type == MONO_TYPE_R4))) {
-                                       /* An fp value is passed in an ireg */
-
-                                       if (arg->opcode == OP_SPARC_OUTARG_REGPAIR)
-                                               arg->opcode = OP_SPARC_OUTARG_REGPAIR_FLOAT;
-                                       else
-                                               arg->opcode = OP_SPARC_OUTARG_FLOAT;
+               if (sig->hasthis && (i == 0))
+                       arg_type = &mono_defaults.object_class->byval_arg;
+               else
+                       arg_type = sig->params [i - sig->hasthis];
 
-                                       /*
-                                        * The OUTARG (freg) implementation needs an extra dword to store
-                                        * the temporary value.
-                                        */                                     
-                                       extra_space += 8;
-                               }
-                               break;
-                       case ArgOnStack:
-                               arg->opcode = OP_SPARC_OUTARG_MEM;
-                               break;
-                       case ArgOnStackPair:
-                               arg->opcode = OP_SPARC_OUTARG_MEMPAIR;
-                               break;
-                       case ArgInSplitRegStack:
-                               arg->opcode = OP_SPARC_OUTARG_SPLIT_REG_STACK;
-                               arg->backend.reg3 = sparc_o0 + ainfo->reg;
-                               call->used_iregs |= 1 << ainfo->reg;
-                               break;
-                       case ArgInFloatReg:
-                               arg->opcode = OP_SPARC_OUTARG_FLOAT_REG;
-                               arg->backend.reg3 = sparc_f0 + ainfo->reg;
-                               break;
-                       case ArgInDoubleReg:
-                               arg->opcode = OP_SPARC_OUTARG_DOUBLE_REG;
-                               arg->backend.reg3 = sparc_f0 + ainfo->reg;
-                               break;
-                       default:
-                               NOT_IMPLEMENTED;
-                       }
-               }
+               arg_type = mono_type_get_underlying_type (arg_type);
+               if ((i >= sig->hasthis) && (MONO_TYPE_ISSTRUCT(sig->params [i - sig->hasthis])))
+                       emit_pass_vtype (cfg, call, cinfo, ainfo, arg_type, in, sig->pinvoke);
+               else if (!arg_type->byref && ((arg_type->type == MONO_TYPE_I8) || (arg_type->type == MONO_TYPE_U8)))
+                       emit_pass_long (cfg, call, ainfo, in);
+               else if (!arg_type->byref && (arg_type->type == MONO_TYPE_R8))
+                       emit_pass_double (cfg, call, ainfo, in);
+               else if (!arg_type->byref && (arg_type->type == MONO_TYPE_R4))
+                       emit_pass_float (cfg, call, ainfo, in);
+               else
+                       emit_pass_other (cfg, call, ainfo, arg_type, in);
        }
 
        /* Handle the case where there are no implicit arguments */
@@ -1199,85 +1323,71 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
        }
 
        call->stack_usage = cinfo->stack_usage + extra_space;
-       call->out_ireg_args = NULL;
-       call->out_freg_args = NULL;
-       cfg->param_area = MAX (cfg->param_area, call->stack_usage);
-       cfg->flags |= MONO_CFG_HAS_CALLS;
 
        g_free (cinfo);
-       return call;
 }
 
+void
+mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
+{
+       ArgInfo *ainfo = (ArgInfo*)ins->inst_p1;
+       int size = ins->backend.size;
+
+       mini_emit_memcpy (cfg, sparc_sp, ainfo->offset, src->dreg, 0, size, 0);
+}
+
+void
+mono_arch_emit_setret (MonoCompile *cfg, MonoMethod *method, MonoInst *val)
+{
+       CallInfo *cinfo = get_call_info (cfg, mono_method_signature (method), FALSE);
+       MonoType *ret = mini_type_get_underlying_type (cfg->generic_sharing_context, mono_method_signature (method)->ret);
+
+       switch (cinfo->ret.storage) {
+       case ArgInIReg:
+               MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->ret->dreg, val->dreg);
+               break;
+       case ArgInIRegPair:
+               if (ret->type == MONO_TYPE_I8 || ret->type == MONO_TYPE_U8) {
+                       MONO_EMIT_NEW_UNALU (cfg, OP_LMOVE, cfg->ret->dreg, val->dreg);
+               } else {
+                       MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->ret->dreg + 2, val->dreg + 2);
+                       MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->ret->dreg + 1, val->dreg + 1);
+               }
+               break;
+       case ArgInFReg:
+               if (ret->type == MONO_TYPE_R4)
+                       MONO_EMIT_NEW_UNALU (cfg, OP_SETFRET, cfg->ret->dreg, val->dreg);
+               else
+                       MONO_EMIT_NEW_UNALU (cfg, OP_FMOVE, cfg->ret->dreg, val->dreg);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+
+       g_assert (cinfo);
+}
+
+int cond_to_sparc_cond [][3] = {
+       {sparc_be,   sparc_be,   sparc_fbe},
+       {sparc_bne,  sparc_bne,  0},
+       {sparc_ble,  sparc_ble,  sparc_fble},
+       {sparc_bge,  sparc_bge,  sparc_fbge},
+       {sparc_bl,   sparc_bl,   sparc_fbl},
+       {sparc_bg,   sparc_bg,   sparc_fbg},
+       {sparc_bleu, sparc_bleu, 0},
+       {sparc_beu,  sparc_beu,  0},
+       {sparc_blu,  sparc_blu,  sparc_fbl},
+       {sparc_bgu,  sparc_bgu,  sparc_fbg}
+};
+
 /* Map opcode to the sparc condition codes */
 static inline SparcCond
 opcode_to_sparc_cond (int opcode)
 {
+       CompRelation rel;
+       CompType t;
+
        switch (opcode) {
-       case OP_FBGE:
-               return sparc_fbge;
-       case OP_FBLE:
-               return sparc_fble;
-       case OP_FBEQ:
-       case OP_FCEQ:
-               return sparc_fbe;
-       case OP_FBLT:
-       case OP_FCLT:
-       case OP_FCLT_UN:
-               return sparc_fbl;
-       case OP_FBGT:
-       case OP_FCGT:
-       case OP_FCGT_UN:
-               return sparc_fbg;
-       case CEE_BEQ:
-       case OP_IBEQ:
-       case OP_CEQ:
-       case OP_ICEQ:
-       case OP_COND_EXC_EQ:
-               return sparc_be;
-       case CEE_BNE_UN:
-       case OP_COND_EXC_NE_UN:
-       case OP_IBNE_UN:
-               return sparc_bne;
-       case CEE_BLT:
-       case OP_IBLT:
-       case OP_CLT:
-       case OP_ICLT:
-       case OP_COND_EXC_LT:
-               return sparc_bl;
-       case CEE_BLT_UN:
-       case OP_IBLT_UN:
-       case OP_CLT_UN:
-       case OP_ICLT_UN:
-       case OP_COND_EXC_LT_UN:
-               return sparc_blu;
-       case CEE_BGT:
-       case OP_IBGT:
-       case OP_CGT:
-       case OP_ICGT:
-       case OP_COND_EXC_GT:
-               return sparc_bg;
-       case CEE_BGT_UN:
-       case OP_IBGT_UN:
-       case OP_CGT_UN:
-       case OP_ICGT_UN:
-       case OP_COND_EXC_GT_UN:
-               return sparc_bgu;
-       case CEE_BGE:
-       case OP_IBGE:
-       case OP_COND_EXC_GE:
-               return sparc_bge;
-       case CEE_BGE_UN:
-       case OP_IBGE_UN:
-       case OP_COND_EXC_GE_UN:
-               return sparc_beu;
-       case CEE_BLE:
-       case OP_IBLE:
-       case OP_COND_EXC_LE:
-               return sparc_ble;
-       case CEE_BLE_UN:
-       case OP_IBLE_UN:
-       case OP_COND_EXC_LE_UN:
-               return sparc_bleu;
        case OP_COND_EXC_OV:
        case OP_COND_EXC_IOV:
                return sparc_bvs;
@@ -1288,26 +1398,22 @@ opcode_to_sparc_cond (int opcode)
        case OP_COND_EXC_NC:
                NOT_IMPLEMENTED;
        default:
-               g_assert_not_reached ();
-               return sparc_be;
+               rel = mono_opcode_to_cond (opcode);
+               t = mono_opcode_to_type (opcode, -1);
+
+               return cond_to_sparc_cond [rel][t];
+               break;
        }
+
+       return -1;
 }
 
 #define COMPUTE_DISP(ins) \
-if (ins->flags & MONO_INST_BRLABEL) { \
-        if (ins->inst_i0->inst_c0) \
-           disp = (ins->inst_i0->inst_c0 - ((guint8*)code - cfg->native_code)) >> 2; \
-        else { \
-            disp = 0; \
-               mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_LABEL, ins->inst_i0); \
-        } \
-} else { \
-        if (ins->inst_true_bb->native_offset) \
-           disp = (ins->inst_true_bb->native_offset - ((guint8*)code - cfg->native_code)) >> 2; \
-        else { \
-            disp = 0; \
-               mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_BB, ins->inst_true_bb); \
-        } \
+if (ins->inst_true_bb->native_offset) \
+   disp = (ins->inst_true_bb->native_offset - ((guint8*)code - cfg->native_code)) >> 2; \
+else { \
+    disp = 0; \
+       mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_BB, ins->inst_true_bb); \
 }
 
 #ifdef SPARCV9
@@ -1379,7 +1485,7 @@ if (ins->flags & MONO_INST_BRLABEL) { \
 #define EMIT_COND_SYSTEM_EXCEPTION_GENERAL(ins,cond,sexc_name,filldelay,icc) do {     \
                mono_add_patch_info (cfg, (guint8*)(code) - (cfg)->native_code,   \
                                    MONO_PATCH_INFO_EXC, sexc_name);  \
-        if (sparcv9 && ((icc) != sparc_icc_short)) {          \
+        if (mono_hwcap_sparc_is_v9 && ((icc) != sparc_icc_short)) {          \
            sparc_branchp (code, 0, (cond), (icc), 0, 0); \
         } \
         else { \
@@ -1482,14 +1588,18 @@ emit_call (MonoCompile *cfg, guint32 *code, guint32 patch_type, gconstpointer da
        return code;
 }
 
-static void
-peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
+void
+mono_arch_peephole_pass_1 (MonoCompile *cfg, MonoBasicBlock *bb)
 {
-       MonoInst *ins, *n;
+}
 
-       MONO_INST_LIST_FOR_EACH_ENTRY_SAFE (ins, n, &bb->ins_list, node) {
-               MonoInst *last_ins = mono_inst_list_prev (&ins->node, &bb->ins_list);
+void
+mono_arch_peephole_pass_2 (MonoCompile *cfg, MonoBasicBlock *bb)
+{
+       MonoInst *ins, *n, *last_ins = NULL;
+       ins = bb->code;
 
+       MONO_BB_FOR_EACH_INS_SAFE (bb, n, ins) {
                switch (ins->opcode) {
                case OP_MUL_IMM: 
                        /* remove unnecessary multiplication with 1 */
@@ -1497,7 +1607,7 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                                if (ins->dreg != ins->sreg1) {
                                        ins->opcode = OP_MOVE;
                                } else {
-                                       MONO_DEL_INS (ins);
+                                       MONO_DELETE_INS (bb, ins);
                                        continue;
                                }
                        }
@@ -1514,7 +1624,7 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                            ins->inst_basereg == last_ins->inst_destbasereg &&
                            ins->inst_offset == last_ins->inst_offset) {
                                if (ins->dreg == last_ins->sreg1) {
-                                       MONO_DEL_INS (ins);
+                                       MONO_DELETE_INS (bb, ins);
                                        continue;
                                } else {
                                        //static int c = 0; printf ("MATCHX %s %d\n", cfg->method->name,c++);
@@ -1537,7 +1647,7 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                              ins->inst_offset == last_ins->inst_offset) {
 
                                if (ins->dreg == last_ins->dreg) {
-                                       MONO_DEL_INS (ins);
+                                       MONO_DELETE_INS (bb, ins);
                                        continue;
                                } else {
                                        ins->opcode = OP_MOVE;
@@ -1571,7 +1681,7 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                                        ins->inst_basereg == last_ins->inst_destbasereg &&
                                        ins->inst_offset == last_ins->inst_offset) {
                                if (ins->dreg == last_ins->sreg1) {
-                                       MONO_DEL_INS (ins);
+                                       MONO_DELETE_INS (bb, ins);
                                        continue;
                                } else {
                                        //static int c = 0; printf ("MATCHX %s %d\n", cfg->method->name,c++);
@@ -1585,7 +1695,7 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                                        ins->inst_basereg == last_ins->inst_destbasereg &&
                                        ins->inst_offset == last_ins->inst_offset) {
                                if (ins->dreg == last_ins->sreg1) {
-                                       MONO_DEL_INS (ins);
+                                       MONO_DELETE_INS (bb, ins);
                                        continue;
                                } else {
                                        //static int c = 0; printf ("MATCHX %s %d\n", cfg->method->name,c++);
@@ -1606,20 +1716,20 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                                ((ins->inst_offset == last_ins->inst_offset - 4)) &&
                                (ins->inst_imm == 0) &&
                                (last_ins->inst_imm == 0)) {
-                               if (sparcv9) {
+                               if (mono_hwcap_sparc_is_v9) {
                                        last_ins->opcode = OP_STOREI8_MEMBASE_IMM;
                                        last_ins->inst_offset = ins->inst_offset;
-                                       MONO_DEL_INS (ins);
+                                       MONO_DELETE_INS (bb, ins);
                                        continue;
                                }
                        }
                        break;
-               case CEE_BEQ:
-               case CEE_BNE_UN:
-               case CEE_BLT:
-               case CEE_BGT:
-               case CEE_BGE:
-               case CEE_BLE:
+               case OP_IBEQ:
+               case OP_IBNE_UN:
+               case OP_IBLT:
+               case OP_IBGT:
+               case OP_IBGE:
+               case OP_IBLE:
                case OP_COND_EXC_EQ:
                case OP_COND_EXC_GE:
                case OP_COND_EXC_GT:
@@ -1635,26 +1745,26 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                         * Only do this if the method is small since BPr only has a 16bit
                         * displacement.
                         */
-                       if (v64 && (mono_method_get_header (cfg->method)->code_size < 10000) && last_ins && 
+                       if (v64 && (cfg->header->code_size < 10000) && last_ins && 
                                (last_ins->opcode == OP_COMPARE_IMM) &&
                                (last_ins->inst_imm == 0)) {
                                switch (ins->opcode) {
-                               case CEE_BEQ:
+                               case OP_IBEQ:
                                        ins->opcode = OP_SPARC_BRZ;
                                        break;
-                               case CEE_BNE_UN:
+                               case OP_IBNE_UN:
                                        ins->opcode = OP_SPARC_BRNZ;
                                        break;
-                               case CEE_BLT:
+                               case OP_IBLT:
                                        ins->opcode = OP_SPARC_BRLZ;
                                        break;
-                               case CEE_BGT:
+                               case OP_IBGT:
                                        ins->opcode = OP_SPARC_BRGZ;
                                        break;
-                               case CEE_BGE:
+                               case OP_IBGE:
                                        ins->opcode = OP_SPARC_BRGEZ;
                                        break;
-                               case CEE_BLE:
+                               case OP_IBLE:
                                        ins->opcode = OP_SPARC_BRLEZ;
                                        break;
                                case OP_COND_EXC_EQ:
@@ -1678,28 +1788,18 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                                default:
                                        g_assert_not_reached ();
                                }
-                               last_ins->data = ins->data;
-                               last_ins->opcode = ins->opcode;
-                               last_ins->type = ins->type;
-                               last_ins->ssa_op = ins->ssa_op;
-                               last_ins->flags = ins->flags;
-                               last_ins->dreg = ins->dreg;
-                               last_ins->sreg2 = ins->sreg2;
-                               last_ins->backend = ins->backend;
-                               last_ins->klass = ins->klass;
-                               last_ins->cil_code = ins->cil_code;
-                               MONO_DEL_INS (ins);
+                               ins->sreg1 = last_ins->sreg1;
+                               *last_ins = *ins;
+                               MONO_DELETE_INS (bb, ins);
                                continue;
                        }
                        break;
-               case CEE_CONV_I4:
-               case CEE_CONV_U4:
                case OP_MOVE:
                        /* 
                         * OP_MOVE reg, reg 
                         */
                        if (ins->dreg == ins->sreg1) {
-                               MONO_DEL_INS (ins);
+                               MONO_DELETE_INS (bb, ins);
                                continue;
                        }
                        /* 
@@ -1709,41 +1809,38 @@ peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                        if (last_ins && last_ins->opcode == OP_MOVE &&
                            ins->sreg1 == last_ins->dreg &&
                            ins->dreg == last_ins->sreg1) {
-                               MONO_DEL_INS (ins);
+                               MONO_DELETE_INS (bb, ins);
                                continue;
                        }
                        break;
                }
+               last_ins = ins;
+               ins = ins->next;
        }
+       bb->last_ins = last_ins;
 }
 
-static int
-mono_spillvar_offset_float (MonoCompile *cfg, int spillvar)
+void
+mono_arch_decompose_long_opts (MonoCompile *cfg, MonoInst *ins)
 {
-       MonoSpillInfo **si, *info;
-
-       g_assert (spillvar == 0);
-
-       si = &cfg->spill_info_float; 
-
-       if (!*si) {
-               *si = info = mono_mempool_alloc (cfg->mempool, sizeof (MonoSpillInfo));
-               cfg->stack_offset += sizeof (double);
-               cfg->stack_offset = ALIGN_TO (cfg->stack_offset, 8);
-               info->offset = - cfg->stack_offset;
+       switch (ins->opcode) {
+       case OP_LNEG:
+               MONO_EMIT_NEW_BIALU (cfg, OP_SUBCC, ins->dreg + 1, 0, ins->sreg1 + 1);
+               MONO_EMIT_NEW_BIALU (cfg, OP_SBB, ins->dreg + 2, 0, ins->sreg1 + 2);
+               NULLIFY_INS (ins);
+               break;
+       default:
+               break;
        }
-
-       return MONO_SPARC_STACK_BIAS + (*si)->offset;
 }
 
-/* FIXME: Strange loads from the stack in basic-float.cs:test_2_rem */
-
 void
-mono_arch_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
+mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
 {
-       mono_local_regalloc (cfg, bb);
 }
 
+/* FIXME: Strange loads from the stack in basic-float.cs:test_2_rem */
+
 static void
 sparc_patch (guint32 *code, const gpointer target)
 {
@@ -1947,7 +2044,7 @@ emit_move_return_value (MonoInst *ins, guint32 *code)
        case OP_VOIDCALL_REG:
        case OP_VOIDCALL_MEMBASE:
                break;
-       case CEE_CALL:
+       case OP_CALL:
        case OP_CALL_REG:
        case OP_CALL_MEMBASE:
                g_assert (ins->dreg == sparc_o0);
@@ -1986,6 +2083,9 @@ emit_move_return_value (MonoInst *ins, guint32 *code)
        case OP_VCALL:
        case OP_VCALL_REG:
        case OP_VCALL_MEMBASE:
+       case OP_VCALL2:
+       case OP_VCALL2_REG:
+       case OP_VCALL2_MEMBASE:
                break;
        default:
                NOT_IMPLEMENTED;
@@ -2021,6 +2121,7 @@ emit_load_volatile_arguments (MonoCompile *cfg, guint32 *code)
                ArgInfo *ainfo = cinfo->args + i;
                gint32 stack_offset;
                MonoType *arg_type;
+
                inst = cfg->args [i];
 
                if (sig->hasthis && (i == 0))
@@ -2146,95 +2247,6 @@ mono_sparc_is_virtual_call (guint32 *code)
        return FALSE;
 }
 
-/*
- * mono_arch_get_vcall_slot:
- *
- *  Determine the vtable slot used by a virtual call.
- */
-gpointer
-mono_arch_get_vcall_slot (guint8 *code8, gpointer *regs, int *displacement)
-{
-       guint32 *code = (guint32*)(gpointer)code8;
-       guint32 ins = code [0];
-       guint32 prev_ins = code [-1];
-
-       mono_sparc_flushw ();
-
-       *displacement = 0;
-
-       if (!mono_sparc_is_virtual_call (code))
-               return NULL;
-
-       if ((sparc_inst_op (ins) == 0x2) && (sparc_inst_op3 (ins) == 0x38)) {
-               if ((sparc_inst_op (prev_ins) == 0x3) && (sparc_inst_i (prev_ins) == 1) && (sparc_inst_op3 (prev_ins) == 0 || sparc_inst_op3 (prev_ins) == 0xb)) {
-                       /* ld [r1 + CONST ], r2; call r2 */
-                       guint32 base = sparc_inst_rs1 (prev_ins);
-                       gint32 disp = (((gint32)(sparc_inst_imm13 (prev_ins))) << 19) >> 19;
-                       gpointer base_val;
-
-                       g_assert (sparc_inst_rd (prev_ins) == sparc_inst_rs1 (ins));
-
-                       g_assert ((base >= sparc_o0) && (base <= sparc_i7));
-
-                       base_val = regs [base];
-
-                       *displacement = disp;
-
-                       return (gpointer)base_val;
-               }
-               else if ((sparc_inst_op (prev_ins) == 0x3) && (sparc_inst_i (prev_ins) == 0) && (sparc_inst_op3 (prev_ins) == 0)) {
-                       /* set r1, ICONST; ld [r1 + r2], r2; call r2 */
-                       /* Decode a sparc_set32 */
-                       guint32 base = sparc_inst_rs1 (prev_ins);
-                       guint32 disp;
-                       gpointer base_val;
-                       guint32 s1 = code [-3];
-                       guint32 s2 = code [-2];
-
-#ifdef SPARCV9
-                       NOT_IMPLEMENTED;
-#endif
-
-                       /* sparc_sethi */
-                       g_assert (sparc_inst_op (s1) == 0);
-                       g_assert (sparc_inst_op2 (s1) == 4);
-
-                       /* sparc_or_imm */
-                       g_assert (sparc_inst_op (s2) == 2);
-                       g_assert (sparc_inst_op3 (s2) == 2);
-                       g_assert (sparc_inst_i (s2) == 1);
-                       g_assert (sparc_inst_rs1 (s2) == sparc_inst_rd (s2));
-                       g_assert (sparc_inst_rd (s1) == sparc_inst_rs1 (s2));
-
-                       disp = ((s1 & 0x3fffff) << 10) | sparc_inst_imm13 (s2);
-
-                       g_assert ((base >= sparc_o0) && (base <= sparc_i7));
-
-                       base_val = regs [base];
-
-                       *displacement = disp;
-
-                       return (gpointer)base_val;
-               } else
-                       g_assert_not_reached ();
-       }
-       else
-               g_assert_not_reached ();
-
-       return NULL;
-}
-
-gpointer*
-mono_arch_get_vcall_slot_addr (guint8 *code, gpointer *regs)
-{
-       gpointer vt;
-       int displacement;
-       vt = mono_arch_get_vcall_slot (code, regs, &displacement);
-       if (!vt)
-               return NULL;
-       return (gpointer*)((char*)vt + displacement);
-}
-
 #define CMP_SIZE 3
 #define BR_SMALL_SIZE 2
 #define BR_LARGE_SIZE 2
@@ -2245,7 +2257,8 @@ mono_arch_get_vcall_slot_addr (guint8 *code, gpointer *regs)
  * LOCKING: called with the domain lock held
  */
 gpointer
-mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckItem **imt_entries, int count)
+mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckItem **imt_entries, int count,
+       gpointer fail_tramp)
 {
        int i;
        int size = 0;
@@ -2259,6 +2272,8 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
                                        item->chunk_size += CMP_SIZE;
                                item->chunk_size += BR_SMALL_SIZE + JUMP_IMM_SIZE;
                        } else {
+                               if (fail_tramp)
+                                       item->chunk_size += 16;
                                item->chunk_size += JUMP_IMM_SIZE;
 #if ENABLE_WRONG_METHOD_CHECK
                                item->chunk_size += CMP_SIZE + BR_SMALL_SIZE + 1;
@@ -2270,31 +2285,47 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
                }
                size += item->chunk_size;
        }
-       code = mono_code_manager_reserve (domain->code_mp, size * 4);
+       if (fail_tramp)
+               code = mono_method_alloc_generic_virtual_thunk (domain, size * 4);
+       else
+               code = mono_domain_code_reserve (domain, size * 4);
        start = code;
-
        for (i = 0; i < count; ++i) {
                MonoIMTCheckItem *item = imt_entries [i];
                item->code_target = (guint8*)code;
                if (item->is_equals) {
-                       if (item->check_target_idx) {
-                               if (!item->compare_done) {
-                                       sparc_set (code, (guint32)item->method, sparc_g5);
+                       gboolean fail_case = !item->check_target_idx && fail_tramp;
+
+                       if (item->check_target_idx || fail_case) {
+                               if (!item->compare_done || fail_case) {
+                                       sparc_set (code, (guint32)item->key, sparc_g5);
                                        sparc_cmp (code, MONO_ARCH_IMT_REG, sparc_g5);
                                }
                                item->jmp_code = (guint8*)code;
                                sparc_branch (code, 0, sparc_bne, 0);
                                sparc_nop (code);
-                               sparc_set (code, ((guint32)(&(vtable->vtable [item->vtable_slot]))), sparc_g5);
-                               sparc_ld (code, sparc_g5, 0, sparc_g5);
+                               if (item->has_target_code) {
+                                       sparc_set (code, item->value.target_code, sparc_f5);
+                               } else {
+                                       sparc_set (code, ((guint32)(&(vtable->vtable [item->value.vtable_slot]))), sparc_g5);
+                                       sparc_ld (code, sparc_g5, 0, sparc_g5);
+                               }
                                sparc_jmpl (code, sparc_g5, sparc_g0, sparc_g0);
                                sparc_nop (code);
+
+                               if (fail_case) {
+                                       sparc_patch (item->jmp_code, code);
+                                       sparc_set (code, fail_tramp, sparc_g5);
+                                       sparc_jmpl (code, sparc_g5, sparc_g0, sparc_g0);
+                                       sparc_nop (code);
+                                       item->jmp_code = NULL;
+                               }
                        } else {
                                /* enable the commented code to assert on wrong method */
 #if ENABLE_WRONG_METHOD_CHECK
                                g_assert_not_reached ();
 #endif
-                               sparc_set (code, ((guint32)(&(vtable->vtable [item->vtable_slot]))), sparc_g5);
+                               sparc_set (code, ((guint32)(&(vtable->vtable [item->value.vtable_slot]))), sparc_g5);
                                sparc_ld (code, sparc_g5, 0, sparc_g5);
                                sparc_jmpl (code, sparc_g5, sparc_g0, sparc_g0);
                                sparc_nop (code);
@@ -2303,7 +2334,7 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
 #endif
                        }
                } else {
-                       sparc_set (code, (guint32)item->method, sparc_g5);
+                       sparc_set (code, (guint32)item->key, sparc_g5);
                        sparc_cmp (code, MONO_ARCH_IMT_REG, sparc_g5);
                        item->jmp_code = (guint8*)code;
                        sparc_branch (code, 0, sparc_beu, 0);
@@ -2328,7 +2359,7 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
 }
 
 MonoMethod*
-mono_arch_find_imt_method (gpointer *regs, guint8 *code)
+mono_arch_find_imt_method (mgreg_t *regs, guint8 *code)
 {
 #ifdef SPARCV9
        g_assert_not_reached ();
@@ -2337,8 +2368,8 @@ mono_arch_find_imt_method (gpointer *regs, guint8 *code)
        return (MonoMethod*)regs [sparc_g1];
 }
 
-MonoObject*
-mono_arch_find_this_argument (gpointer *regs, MonoMethod *method)
+gpointer
+mono_arch_get_this_arg_from_call (mgreg_t *regs, guint8 *code)
 {
        mono_sparc_flushw ();
 
@@ -2358,12 +2389,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
        MonoCallInst *call;
        guint offset;
        guint32 *code = (guint32*)(cfg->native_code + cfg->code_len);
+       MonoInst *last_ins = NULL;
        int max_len, cpos;
        const char *spec;
 
-       if (cfg->opt & MONO_OPT_PEEPHOLE)
-               peephole_pass (cfg, bb);
-
        if (cfg->verbose_level > 2)
                g_print ("Basic block %d starting at offset 0x%x\n", bb->block_num, bb->native_offset);
 
@@ -2435,23 +2464,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_STORE_MEMBASE_REG:
                        EMIT_STORE_MEMBASE_REG (ins, sti);
                        break;
-               case CEE_LDIND_I:
-#ifdef SPARCV9
-                       sparc_ldx (code, ins->inst_c0, sparc_g0, ins->dreg);
-#else
-                       sparc_ld (code, ins->inst_c0, sparc_g0, ins->dreg);
-#endif
-                       break;
-               case CEE_LDIND_I4:
-#ifdef SPARCV9
-                       sparc_ldsw (code, ins->inst_c0, sparc_g0, ins->dreg);
-#else
-                       sparc_ld (code, ins->inst_c0, sparc_g0, ins->dreg);
-#endif
-                       break;
-               case CEE_LDIND_U4:
-                       sparc_ld (code, ins->inst_c0, sparc_g0, ins->dreg);
-                       break;
                case OP_LOADU4_MEM:
                        sparc_set (code, ins->inst_c0, ins->dreg);
                        sparc_ld (code, ins->dreg, sparc_g0, ins->dreg);
@@ -2490,22 +2502,23 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        EMIT_LOAD_MEMBASE (ins, ldx);
                        break;
 #endif
-               case CEE_CONV_I1:
+               case OP_ICONV_TO_I1:
                        sparc_sll_imm (code, ins->sreg1, 24, sparc_o7);
                        sparc_sra_imm (code, sparc_o7, 24, ins->dreg);
                        break;
-               case CEE_CONV_I2:
+               case OP_ICONV_TO_I2:
                        sparc_sll_imm (code, ins->sreg1, 16, sparc_o7);
                        sparc_sra_imm (code, sparc_o7, 16, ins->dreg);
                        break;
-               case CEE_CONV_U1:
+               case OP_ICONV_TO_U1:
                        sparc_and_imm (code, FALSE, ins->sreg1, 0xff, ins->dreg);
                        break;
-               case CEE_CONV_U2:
+               case OP_ICONV_TO_U2:
                        sparc_sll_imm (code, ins->sreg1, 16, sparc_o7);
                        sparc_srl_imm (code, sparc_o7, 16, ins->dreg);
                        break;
-               case CEE_CONV_OVF_U4:
+               case OP_LCONV_TO_OVF_U4:
+               case OP_ICONV_TO_OVF_U4:
                        /* Only used on V9 */
                        sparc_cmp_imm (code, ins->sreg1, 0);
                        mono_add_patch_info (cfg, (guint8*)(code) - (cfg)->native_code,
@@ -2521,20 +2534,11 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        sparc_nop (code);
                        sparc_mov_reg_reg (code, ins->sreg1, ins->dreg);
                        break;
-               case CEE_CONV_OVF_I4_UN:
+               case OP_LCONV_TO_OVF_I4_UN:
+               case OP_ICONV_TO_OVF_I4_UN:
                        /* Only used on V9 */
                        NOT_IMPLEMENTED;
                        break;
-               case CEE_CONV_U:
-               case CEE_CONV_U8:
-                       /* Only used on V9 */
-                       sparc_srl_imm (code, ins->sreg1, 0, ins->dreg);
-                       break;
-               case CEE_CONV_I:
-               case CEE_CONV_I8:
-                       /* Only used on V9 */
-                       sparc_sra_imm (code, ins->sreg1, 0, ins->dreg);
-                       break;
                case OP_COMPARE:
                case OP_LCOMPARE:
                case OP_ICOMPARE:
@@ -2563,7 +2567,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_IADDCC:
                        sparc_add (code, TRUE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
-               case CEE_ADD:
                case OP_IADD:
                        sparc_add (code, FALSE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2586,7 +2589,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_ISUBCC:
                        sparc_sub (code, TRUE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
-               case CEE_SUB:
                case OP_ISUB:
                        sparc_sub (code, FALSE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2605,7 +2607,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_ISBB_IMM:
                        EMIT_ALU_IMM (ins, subx, TRUE);
                        break;
-               case CEE_AND:
                case OP_IAND:
                        sparc_and (code, FALSE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2613,7 +2614,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_IAND_IMM:
                        EMIT_ALU_IMM (ins, and, FALSE);
                        break;
-               case CEE_DIV:
                case OP_IDIV:
                        /* Sign extend sreg1 into %y */
                        sparc_sra_imm (code, ins->sreg1, 31, sparc_o7);
@@ -2621,12 +2621,12 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        sparc_sdiv (code, TRUE, ins->sreg1, ins->sreg2, ins->dreg);
                        EMIT_COND_SYSTEM_EXCEPTION_GENERAL (code, sparc_boverflow, "ArithmeticException", TRUE, sparc_icc_short);
                        break;
-               case CEE_DIV_UN:
                case OP_IDIV_UN:
                        sparc_wry (code, sparc_g0, sparc_g0);
                        sparc_udiv (code, FALSE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
-               case OP_DIV_IMM: {
+               case OP_DIV_IMM:
+               case OP_IDIV_IMM: {
                        int i, imm;
 
                        /* Transform division into a shift */
@@ -2659,7 +2659,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        }
                        break;
                }
-               case CEE_REM:
+               case OP_IDIV_UN_IMM:
+                       sparc_wry (code, sparc_g0, sparc_g0);
+                       EMIT_ALU_IMM (ins, udiv, FALSE);
+                       break;
                case OP_IREM:
                        /* Sign extend sreg1 into %y */
                        sparc_sra_imm (code, ins->sreg1, 31, sparc_o7);
@@ -2669,7 +2672,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        sparc_smul (code, FALSE, ins->sreg2, sparc_o7, sparc_o7);
                        sparc_sub (code, FALSE, ins->sreg1, sparc_o7, ins->dreg);
                        break;
-               case CEE_REM_UN:
                case OP_IREM_UN:
                        sparc_wry (code, sparc_g0, sparc_g0);
                        sparc_udiv (code, FALSE, ins->sreg1, ins->sreg2, sparc_o7);
@@ -2694,7 +2696,13 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        }
                        sparc_sub (code, FALSE, ins->sreg1, sparc_o7, ins->dreg);
                        break;
-               case CEE_OR:
+               case OP_IREM_UN_IMM:
+                       sparc_set (code, ins->inst_imm, GP_SCRATCH_REG);
+                       sparc_wry (code, sparc_g0, sparc_g0);
+                       sparc_udiv (code, FALSE, ins->sreg1, GP_SCRATCH_REG, sparc_o7);
+                       sparc_umul (code, FALSE, GP_SCRATCH_REG, sparc_o7, sparc_o7);
+                       sparc_sub (code, FALSE, ins->sreg1, sparc_o7, ins->dreg);
+                       break;
                case OP_IOR:
                        sparc_or (code, FALSE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2702,7 +2710,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_IOR_IMM:
                        EMIT_ALU_IMM (ins, or, FALSE);
                        break;
-               case CEE_XOR:
                case OP_IXOR:
                        sparc_xor (code, FALSE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2710,7 +2717,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_IXOR_IMM:
                        EMIT_ALU_IMM (ins, xor, FALSE);
                        break;
-               case CEE_SHL:
                case OP_ISHL:
                        sparc_sll (code, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2723,7 +2729,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                sparc_sll (code, ins->sreg1, sparc_o7, ins->dreg);
                        }
                        break;
-               case CEE_SHR:
                case OP_ISHR:
                        sparc_sra (code, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2745,7 +2750,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                sparc_srl (code, ins->sreg1, sparc_o7, ins->dreg);
                        }
                        break;
-               case CEE_SHR_UN:
                case OP_ISHR_UN:
                        sparc_srl (code, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2782,17 +2786,14 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                sparc_srlx (code, ins->sreg1, sparc_o7, ins->dreg);
                        }
                        break;
-               case CEE_NOT:
                case OP_INOT:
                        /* can't use sparc_not */
                        sparc_xnor (code, FALSE, ins->sreg1, sparc_g0, ins->dreg);
                        break;
-               case CEE_NEG:
                case OP_INEG:
                        /* can't use sparc_neg */
                        sparc_sub (code, FALSE, sparc_g0, ins->sreg1, ins->dreg);
                        break;
-               case CEE_MUL:
                case OP_IMUL:
                        sparc_smul (code, FALSE, ins->sreg1, ins->sreg2, ins->dreg);
                        break;
@@ -2815,7 +2816,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                EMIT_ALU_IMM (ins, smul, FALSE);
                        break;
                }
-               case CEE_MUL_OVF:
                case OP_IMUL_OVF:
                        sparc_smul (code, TRUE, ins->sreg1, ins->sreg2, ins->dreg);
                        sparc_rdy (code, sparc_g1);
@@ -2823,7 +2823,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        sparc_cmp (code, sparc_g1, sparc_o7);
                        EMIT_COND_SYSTEM_EXCEPTION_GENERAL (ins, sparc_bne, "OverflowException", TRUE, sparc_icc_short);
                        break;
-               case CEE_MUL_OVF_UN:
                case OP_IMUL_OVF_UN:
                        sparc_umul (code, TRUE, ins->sreg1, ins->sreg2, ins->dreg);
                        sparc_rdy (code, sparc_o7);
@@ -2840,20 +2839,24 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        mono_add_patch_info (cfg, offset, (MonoJumpInfoType)ins->inst_i1, ins->inst_p0);
                        sparc_set_template (code, ins->dreg);
                        break;
-               case CEE_CONV_I4:
-               case CEE_CONV_U4:
+               case OP_JUMP_TABLE:
+                       mono_add_patch_info (cfg, offset, (MonoJumpInfoType)ins->inst_i1, ins->inst_p0);
+                       sparc_set_template (code, ins->dreg);
+                       break;
+               case OP_ICONV_TO_I4:
+               case OP_ICONV_TO_U4:
                case OP_MOVE:
                        if (ins->sreg1 != ins->dreg)
                                sparc_mov_reg_reg (code, ins->sreg1, ins->dreg);
                        break;
                case OP_FMOVE:
-                       /* Only used on V9 */
+#ifdef SPARCV9
                        if (ins->sreg1 != ins->dreg)
                                sparc_fmovd (code, ins->sreg1, ins->dreg);
-                       break;
-               case OP_SPARC_SETFREG_FLOAT:
-                       /* Only used on V9 */
-                       sparc_fdtos (code, ins->sreg1, ins->dreg);
+#else
+                       sparc_fmovs (code, ins->sreg1, ins->dreg);
+                       sparc_fmovs (code, ins->sreg1 + 1, ins->dreg + 1);
+#endif
                        break;
                case OP_JMP:
                        if (cfg->method->save_lmf)
@@ -2878,8 +2881,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_FCALL:
                case OP_LCALL:
                case OP_VCALL:
+               case OP_VCALL2:
                case OP_VOIDCALL:
-               case CEE_CALL:
+               case OP_CALL:
                        call = (MonoCallInst*)ins;
                        g_assert (!call->virtual);
                        code = emit_save_sp_to_lmf (cfg, code);
@@ -2894,6 +2898,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_FCALL_REG:
                case OP_LCALL_REG:
                case OP_VCALL_REG:
+               case OP_VCALL2_REG:
                case OP_VOIDCALL_REG:
                case OP_CALL_REG:
                        call = (MonoCallInst*)ins;
@@ -2915,6 +2920,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_FCALL_MEMBASE:
                case OP_LCALL_MEMBASE:
                case OP_VCALL_MEMBASE:
+               case OP_VCALL2_MEMBASE:
                case OP_VOIDCALL_MEMBASE:
                case OP_CALL_MEMBASE:
                        call = (MonoCallInst*)ins;
@@ -2947,11 +2953,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 #endif
                        }
                        break;
-               case OP_OUTARG:
-                       g_assert_not_reached ();
-                       break;
                case OP_LOCALLOC: {
                        guint32 size_reg;
+                       gint32 offset2;
 
 #ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
                        /* Perform stack touching */
@@ -2959,7 +2963,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 #endif
 
                        /* Keep alignment */
-                       sparc_add_imm (code, FALSE, ins->sreg1, MONO_ARCH_LOCALLOC_ALIGNMENT - 1, ins->dreg);
+                       /* Add 4 to compensate for the rounding of localloc_offset */
+                       sparc_add_imm (code, FALSE, ins->sreg1, 4 + MONO_ARCH_LOCALLOC_ALIGNMENT - 1, ins->dreg);
                        sparc_set (code, ~(MONO_ARCH_LOCALLOC_ALIGNMENT - 1), sparc_o7);
                        sparc_and (code, FALSE, ins->dreg, sparc_o7, ins->dreg);
 
@@ -2977,8 +2982,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        sparc_sub (code, FALSE, sparc_sp, ins->dreg, ins->dreg);
                        /* Keep %sp valid at all times */
                        sparc_mov_reg_reg (code, ins->dreg, sparc_sp);
-                       g_assert (sparc_is_imm13 (MONO_SPARC_STACK_BIAS + cfg->arch.localloc_offset));
-                       sparc_add_imm (code, FALSE, ins->dreg, MONO_SPARC_STACK_BIAS + cfg->arch.localloc_offset, ins->dreg);
+                       /* Round localloc_offset too so the result is at least 8 aligned */
+                       offset2 = ALIGN_TO (cfg->arch.localloc_offset, 8);
+                       g_assert (sparc_is_imm13 (MONO_SPARC_STACK_BIAS + offset2));
+                       sparc_add_imm (code, FALSE, ins->dreg, MONO_SPARC_STACK_BIAS + offset2, ins->dreg);
 
                        if (ins->flags & MONO_INST_INIT) {
                                guint32 *br [3];
@@ -2988,10 +2995,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                sparc_branch (code, 0, sparc_be, 0);
                                /* delay slot */
                                sparc_set (code, 0, sparc_o7);
-                               sparc_sub_imm (code, 0, size_reg, sparcv9 ? 8 : 4, size_reg);
+                               sparc_sub_imm (code, 0, size_reg, mono_hwcap_sparc_is_v9 ? 8 : 4, size_reg);
                                /* start of loop */
                                br [1] = code;
-                               if (sparcv9)
+                               if (mono_hwcap_sparc_is_v9)
                                        sparc_stx (code, sparc_g0, ins->dreg, sparc_o7);
                                else
                                        sparc_st (code, sparc_g0, ins->dreg, sparc_o7);
@@ -3000,28 +3007,33 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                sparc_branch (code, 0, sparc_bl, 0);
                                sparc_patch (br [2], br [1]);
                                /* delay slot */
-                               sparc_add_imm (code, 0, sparc_o7, sparcv9 ? 8 : 4, sparc_o7);
+                               sparc_add_imm (code, 0, sparc_o7, mono_hwcap_sparc_is_v9 ? 8 : 4, sparc_o7);
                                sparc_patch (br [0], code);
                        }
                        break;
                }
-               case OP_SPARC_LOCALLOC_IMM: {
-                       gint32 offset = ins->inst_c0;
-
+               case OP_LOCALLOC_IMM: {
+                       gint32 offset = ins->inst_imm;
+                       gint32 offset2;
+                       
 #ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
                        /* Perform stack touching */
                        NOT_IMPLEMENTED;
 #endif
 
-                       offset = ALIGN_TO (offset, MONO_ARCH_LOCALLOC_ALIGNMENT);
+                       /* To compensate for the rounding of localloc_offset */
+                       offset += sizeof (gpointer);
+                       offset = ALIGN_TO (offset, MONO_ARCH_FRAME_ALIGNMENT);
                        if (sparc_is_imm13 (offset))
                                sparc_sub_imm (code, FALSE, sparc_sp, offset, sparc_sp);
                        else {
                                sparc_set (code, offset, sparc_o7);
                                sparc_sub (code, FALSE, sparc_sp, sparc_o7, sparc_sp);
                        }
-                       g_assert (sparc_is_imm13 (MONO_SPARC_STACK_BIAS + cfg->arch.localloc_offset));
-                       sparc_add_imm (code, FALSE, sparc_sp, MONO_SPARC_STACK_BIAS + cfg->arch.localloc_offset, ins->dreg);
+                       /* Round localloc_offset too so the result is at least 8 aligned */
+                       offset2 = ALIGN_TO (cfg->arch.localloc_offset, 8);
+                       g_assert (sparc_is_imm13 (MONO_SPARC_STACK_BIAS + offset2));
+                       sparc_add_imm (code, FALSE, sparc_sp, MONO_SPARC_STACK_BIAS + offset2, ins->dreg);
                        if ((ins->flags & MONO_INST_INIT) && (offset > 0)) {
                                guint32 *br [2];
                                int i;
@@ -3029,7 +3041,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                if (offset <= 16) {
                                        i = 0;
                                        while (i < offset) {
-                                               if (sparcv9) {
+                                               if (mono_hwcap_sparc_is_v9) {
                                                        sparc_stx_imm (code, sparc_g0, ins->dreg, i);
                                                        i += 8;
                                                }
@@ -3041,10 +3053,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                }
                                else {
                                        sparc_set (code, offset, sparc_o7);
-                                       sparc_sub_imm (code, 0, sparc_o7, sparcv9 ? 8 : 4, sparc_o7);
+                                       sparc_sub_imm (code, 0, sparc_o7, mono_hwcap_sparc_is_v9 ? 8 : 4, sparc_o7);
                                        /* beginning of loop */
                                        br [0] = code;
-                                       if (sparcv9)
+                                       if (mono_hwcap_sparc_is_v9)
                                                sparc_stx (code, sparc_g0, ins->dreg, sparc_o7);
                                        else
                                                sparc_st (code, sparc_g0, ins->dreg, sparc_o7);
@@ -3052,16 +3064,12 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        br [1] = code;
                                        sparc_branch (code, 0, sparc_bne, 0);
                                        /* delay slot */
-                                       sparc_sub_imm (code, 0, sparc_o7, sparcv9 ? 8 : 4, sparc_o7);
+                                       sparc_sub_imm (code, 0, sparc_o7, mono_hwcap_sparc_is_v9 ? 8 : 4, sparc_o7);
                                        sparc_patch (br [1], br [0]);
                                }
                        }
                        break;
                }
-               case CEE_RET:
-                       /* The return is done in the epilog */
-                       g_assert_not_reached ();
-                       break;
                case OP_THROW:
                        sparc_mov_reg_reg (code, ins->sreg1, sparc_o0);
                        mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, 
@@ -3122,32 +3130,29 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        /* This is a jump inside the method, so call_simple works even on V9 */
                        sparc_call_simple (code, 0);
                        sparc_nop (code);
+                       mono_cfg_add_try_hole (cfg, ins->inst_eh_block, code, bb);
                        break;
                case OP_LABEL:
                        ins->inst_c0 = (guint8*)code - cfg->native_code;
                        break;
+               case OP_RELAXED_NOP:
+               case OP_NOP:
+               case OP_DUMMY_USE:
+               case OP_DUMMY_STORE:
+               case OP_NOT_REACHED:
+               case OP_NOT_NULL:
+                       break;
                case OP_BR:
-                       if ((ins->inst_target_bb == bb->next_bb) &&
-                           ins->node.next == &bb->ins_list)
+                       //g_print ("target: %p, next: %p, curr: %p, last: %p\n", ins->inst_target_bb, bb->next_bb, ins, bb->last_ins);
+                       if ((ins->inst_target_bb == bb->next_bb) && ins == bb->last_ins)
                                break;
-                       if (ins->flags & MONO_INST_BRLABEL) {
-                               if (ins->inst_i0->inst_c0) {
-                                       gint32 disp = (ins->inst_i0->inst_c0 - ((guint8*)code - cfg->native_code)) >> 2;
-                                       g_assert (sparc_is_imm22 (disp));
-                                       sparc_branch (code, 1, sparc_ba, disp);
-                               } else {
-                                       mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_LABEL, ins->inst_i0);
-                                       sparc_branch (code, 1, sparc_ba, 0);
-                               }
+                       if (ins->inst_target_bb->native_offset) {
+                               gint32 disp = (ins->inst_target_bb->native_offset - ((guint8*)code - cfg->native_code)) >> 2;
+                               g_assert (sparc_is_imm22 (disp));
+                               sparc_branch (code, 1, sparc_ba, disp);
                        } else {
-                               if (ins->inst_target_bb->native_offset) {
-                                       gint32 disp = (ins->inst_target_bb->native_offset - ((guint8*)code - cfg->native_code)) >> 2;
-                                       g_assert (sparc_is_imm22 (disp));
-                                       sparc_branch (code, 1, sparc_ba, disp);
-                               } else {
-                                       mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_BB, ins->inst_target_bb);
-                                       sparc_branch (code, 1, sparc_ba, 0);
-                               } 
+                               mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_BB, ins->inst_target_bb);
+                               sparc_branch (code, 1, sparc_ba, 0);
                        }
                        sparc_nop (code);
                        break;
@@ -3205,7 +3210,25 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_COND_EXC_NO:
                case OP_COND_EXC_C:
                case OP_COND_EXC_NC:
+               case OP_COND_EXC_IEQ:
+               case OP_COND_EXC_INE_UN:
+               case OP_COND_EXC_ILT:
+               case OP_COND_EXC_ILT_UN:
+               case OP_COND_EXC_IGT:
+               case OP_COND_EXC_IGT_UN:
+               case OP_COND_EXC_IGE:
+               case OP_COND_EXC_IGE_UN:
+               case OP_COND_EXC_ILE:
+               case OP_COND_EXC_ILE_UN:
+               case OP_COND_EXC_IOV:
+               case OP_COND_EXC_INO:
+               case OP_COND_EXC_IC:
+               case OP_COND_EXC_INC:
+#ifdef SPARCV9
+                       NOT_IMPLEMENTED;
+#else
                        EMIT_COND_SYSTEM_EXCEPTION (ins, opcode_to_sparc_cond (ins->opcode), ins->inst_p1);
+#endif
                        break;
                case OP_SPARC_COND_EXC_EQZ:
                        EMIT_COND_SYSTEM_EXCEPTION_BPR (ins, brz, ins->inst_p1);
@@ -3225,26 +3248,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_SPARC_COND_EXC_NEZ:
                        EMIT_COND_SYSTEM_EXCEPTION_BPR (ins, brnz, ins->inst_p1);
                        break;
-               case OP_COND_EXC_IOV:
-               case OP_COND_EXC_IC:
-                       EMIT_COND_SYSTEM_EXCEPTION_GENERAL (ins, opcode_to_sparc_cond (ins->opcode), ins->inst_p1, TRUE, sparc_icc_short);
-                       break;
-               case CEE_BEQ:
-               case CEE_BNE_UN:
-               case CEE_BLT:
-               case CEE_BLT_UN:
-               case CEE_BGT:
-               case CEE_BGT_UN:
-               case CEE_BGE:
-               case CEE_BGE_UN:
-               case CEE_BLE:
-               case CEE_BLE_UN: {
-                       if (sparcv9)
-                               EMIT_COND_BRANCH_PREDICTED (ins, opcode_to_sparc_cond (ins->opcode), 1, 1);
-                       else
-                               EMIT_COND_BRANCH (ins, opcode_to_sparc_cond (ins->opcode), 1, 1);
-                       break;
-               }
 
                case OP_IBEQ:
                case OP_IBNE_UN:
@@ -3256,8 +3259,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_IBGE_UN:
                case OP_IBLE:
                case OP_IBLE_UN: {
-                       /* Only used on V9 */
-                       EMIT_COND_BRANCH_ICC (ins, opcode_to_sparc_cond (ins->opcode), 1, 1, sparc_icc_short);
+                       if (mono_hwcap_sparc_is_v9)
+                               EMIT_COND_BRANCH_PREDICTED (ins, opcode_to_sparc_cond (ins->opcode), 1, 1);
+                       else
+                               EMIT_COND_BRANCH (ins, opcode_to_sparc_cond (ins->opcode), 1, 1);
                        break;
                }
 
@@ -3346,60 +3351,61 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        sparc_fstod (code, FP_SCRATCH_REG, ins->dreg);
                        break;
                }
-               case OP_FMOVE:
-#ifdef SPARCV9
-                       sparc_fmovd (code, ins->sreg1, ins->dreg);
-#else
-                       sparc_fmovs (code, ins->sreg1, ins->dreg);
-                       sparc_fmovs (code, ins->sreg1 + 1, ins->dreg + 1);
-#endif
-                       break;
-               case CEE_CONV_R4: {
-                       gint32 offset = mono_spillvar_offset_float (cfg, 0);
+               case OP_ICONV_TO_R4: {
+                       MonoInst *spill = cfg->arch.float_spill_slot;
+                       gint32 reg = spill->inst_basereg;
+                       gint32 offset = spill->inst_offset;
+
+                       g_assert (spill->opcode == OP_REGOFFSET);
 #ifdef SPARCV9
                        if (!sparc_is_imm13 (offset)) {
                                sparc_set (code, offset, sparc_o7);
-                               sparc_stx (code, ins->sreg1, sparc_sp, offset);
-                               sparc_lddf (code, sparc_sp, offset, FP_SCRATCH_REG);
+                               sparc_stx (code, ins->sreg1, reg, offset);
+                               sparc_lddf (code, reg, offset, FP_SCRATCH_REG);
                        } else {
-                               sparc_stx_imm (code, ins->sreg1, sparc_sp, offset);
-                               sparc_lddf_imm (code, sparc_sp, offset, FP_SCRATCH_REG);
+                               sparc_stx_imm (code, ins->sreg1, reg, offset);
+                               sparc_lddf_imm (code, reg, offset, FP_SCRATCH_REG);
                        }
                        sparc_fxtos (code, FP_SCRATCH_REG, FP_SCRATCH_REG);
 #else
                        if (!sparc_is_imm13 (offset)) {
                                sparc_set (code, offset, sparc_o7);
-                               sparc_st (code, ins->sreg1, sparc_sp, sparc_o7);
-                               sparc_ldf (code, sparc_sp, sparc_o7, FP_SCRATCH_REG);
+                               sparc_st (code, ins->sreg1, reg, sparc_o7);
+                               sparc_ldf (code, reg, sparc_o7, FP_SCRATCH_REG);
                        } else {
-                               sparc_st_imm (code, ins->sreg1, sparc_sp, offset);
-                               sparc_ldf_imm (code, sparc_sp, offset, FP_SCRATCH_REG);
+                               sparc_st_imm (code, ins->sreg1, reg, offset);
+                               sparc_ldf_imm (code, reg, offset, FP_SCRATCH_REG);
                        }
                        sparc_fitos (code, FP_SCRATCH_REG, FP_SCRATCH_REG);
 #endif
                        sparc_fstod (code, FP_SCRATCH_REG, ins->dreg);
                        break;
                }
-               case CEE_CONV_R8: {
-                       gint32 offset = mono_spillvar_offset_float (cfg, 0);
+               case OP_ICONV_TO_R8: {
+                       MonoInst *spill = cfg->arch.float_spill_slot;
+                       gint32 reg = spill->inst_basereg;
+                       gint32 offset = spill->inst_offset;
+
+                       g_assert (spill->opcode == OP_REGOFFSET);
+
 #ifdef SPARCV9
                        if (!sparc_is_imm13 (offset)) {
                                sparc_set (code, offset, sparc_o7);
-                               sparc_stx (code, ins->sreg1, sparc_sp, sparc_o7);
-                               sparc_lddf (code, sparc_sp, sparc_o7, FP_SCRATCH_REG);
+                               sparc_stx (code, ins->sreg1, reg, sparc_o7);
+                               sparc_lddf (code, reg, sparc_o7, FP_SCRATCH_REG);
                        } else {
-                               sparc_stx_imm (code, ins->sreg1, sparc_sp, offset);
-                               sparc_lddf_imm (code, sparc_sp, offset, FP_SCRATCH_REG);
+                               sparc_stx_imm (code, ins->sreg1, reg, offset);
+                               sparc_lddf_imm (code, reg, offset, FP_SCRATCH_REG);
                        }
                        sparc_fxtod (code, FP_SCRATCH_REG, ins->dreg);
 #else
                        if (!sparc_is_imm13 (offset)) {
                                sparc_set (code, offset, sparc_o7);
-                               sparc_st (code, ins->sreg1, sparc_sp, sparc_o7);
-                               sparc_ldf (code, sparc_sp, sparc_o7, FP_SCRATCH_REG);
+                               sparc_st (code, ins->sreg1, reg, sparc_o7);
+                               sparc_ldf (code, reg, sparc_o7, FP_SCRATCH_REG);
                        } else {
-                               sparc_st_imm (code, ins->sreg1, sparc_sp, offset);
-                               sparc_ldf_imm (code, sparc_sp, offset, FP_SCRATCH_REG);
+                               sparc_st_imm (code, ins->sreg1, reg, offset);
+                               sparc_ldf_imm (code, reg, offset, FP_SCRATCH_REG);
                        }
                        sparc_fitod (code, FP_SCRATCH_REG, ins->dreg);
 #endif
@@ -3415,15 +3421,20 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 #endif
                case OP_FCONV_TO_I4:
                case OP_FCONV_TO_U4: {
-                       gint32 offset = mono_spillvar_offset_float (cfg, 0);
+                       MonoInst *spill = cfg->arch.float_spill_slot;
+                       gint32 reg = spill->inst_basereg;
+                       gint32 offset = spill->inst_offset;
+
+                       g_assert (spill->opcode == OP_REGOFFSET);
+
                        sparc_fdtoi (code, ins->sreg1, FP_SCRATCH_REG);
                        if (!sparc_is_imm13 (offset)) {
                                sparc_set (code, offset, sparc_o7);
-                               sparc_stdf (code, FP_SCRATCH_REG, sparc_sp, sparc_o7);
-                               sparc_ld (code, sparc_sp, sparc_o7, ins->dreg);
+                               sparc_stdf (code, FP_SCRATCH_REG, reg, sparc_o7);
+                               sparc_ld (code, reg, sparc_o7, ins->dreg);
                        } else {
-                               sparc_stdf_imm (code, FP_SCRATCH_REG, sparc_sp, offset);
-                               sparc_ld_imm (code, sparc_sp, offset, ins->dreg);
+                               sparc_stdf_imm (code, FP_SCRATCH_REG, reg, offset);
+                               sparc_ld_imm (code, reg, offset, ins->dreg);
                        }
 
                        switch (ins->opcode) {
@@ -3446,16 +3457,22 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        /* Emulated */
                        g_assert_not_reached ();
                        break;
-               case CEE_CONV_R_UN:
-                       /* Emulated */
-                       g_assert_not_reached ();
+               case OP_FCONV_TO_R4:
+                       /* FIXME: Change precision ? */
+#ifdef SPARCV9
+                       sparc_fmovd (code, ins->sreg1, ins->dreg);
+#else
+                       sparc_fmovs (code, ins->sreg1, ins->dreg);
+                       sparc_fmovs (code, ins->sreg1 + 1, ins->dreg + 1);
+#endif
                        break;
                case OP_LCONV_TO_R_UN: { 
                        /* Emulated */
                        g_assert_not_reached ();
                        break;
                }
-               case OP_LCONV_TO_OVF_I: {
+               case OP_LCONV_TO_OVF_I:
+               case OP_LCONV_TO_OVF_I4_2: {
                        guint32 *br [3], *label [1];
 
                        /* 
@@ -3590,14 +3607,19 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        EMIT_FLOAT_COND_BRANCH (ins, sparc_fbu, 1, 1);
                        break;
                case OP_CKFINITE: {
-                       gint32 offset = mono_spillvar_offset_float (cfg, 0);
+                       MonoInst *spill = cfg->arch.float_spill_slot;
+                       gint32 reg = spill->inst_basereg;
+                       gint32 offset = spill->inst_offset;
+
+                       g_assert (spill->opcode == OP_REGOFFSET);
+
                        if (!sparc_is_imm13 (offset)) {
                                sparc_set (code, offset, sparc_o7);
-                               sparc_stdf (code, ins->sreg1, sparc_sp, sparc_o7);
-                               sparc_lduh (code, sparc_sp, sparc_o7, sparc_o7);
+                               sparc_stdf (code, ins->sreg1, reg, sparc_o7);
+                               sparc_lduh (code, reg, sparc_o7, sparc_o7);
                        } else {
-                               sparc_stdf_imm (code, ins->sreg1, sparc_sp, offset);
-                               sparc_lduh_imm (code, sparc_sp, offset, sparc_o7);
+                               sparc_stdf_imm (code, ins->sreg1, reg, offset);
+                               sparc_lduh_imm (code, reg, offset, sparc_o7);
                        }
                        sparc_srl_imm (code, sparc_o7, 4, sparc_o7);
                        sparc_and_imm (code, FALSE, sparc_o7, 2047, sparc_o7);
@@ -3632,6 +3654,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                }
               
                cpos += max_len;
+
+               last_ins = ins;
        }
 
        cfg->code_len = (guint8*)code - cfg->native_code;
@@ -3644,7 +3668,7 @@ mono_arch_register_lowlevel_calls (void)
 }
 
 void
-mono_arch_patch_code (MonoMethod *method, MonoDomain *domain, guint8 *code, MonoJumpInfo *ji, gboolean run_cctors)
+mono_arch_patch_code (MonoMethod *method, MonoDomain *domain, guint8 *code, MonoJumpInfo *ji, MonoCodeManager *dyn_code_mp, gboolean run_cctors)
 {
        MonoJumpInfo *patch_info;
 
@@ -3752,7 +3776,7 @@ enum {
 };
 
 void*
-mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments)
+mono_arch_instrument_epilog_full (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments, gboolean preserve_argument_registers)
 {
        guint32 *code = (guint32*)p;
        int save_mode = SAVE_NONE;
@@ -4084,7 +4108,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
        while (cfg->code_len + max_epilog_size > (cfg->code_size - 16)) {
                cfg->code_size *= 2;
                cfg->native_code = g_realloc (cfg->native_code, cfg->code_size);
-               mono_jit_stats.code_reallocs++;
+               cfg->stat_code_reallocs++;
        }
 
        code = (guint32*)(cfg->native_code + cfg->code_len);
@@ -4112,6 +4136,12 @@ mono_arch_emit_epilog (MonoCompile *cfg)
        if (cfg->bb_exit->in_count == 1 && cfg->bb_exit->in_bb[0]->native_offset != cfg->bb_exit->native_offset)
                can_fold = 1;
 
+       /* 
+        * FIXME: The last instruction might have a branch pointing into it like in 
+        * int_ceq sparc_i0 <-
+        */
+       can_fold = 0;
+
        /* Try folding last instruction into the restore */
        if (can_fold && (sparc_inst_op (code [-2]) == 0x2) && (sparc_inst_op3 (code [-2]) == 0x2) && sparc_inst_imm (code [-2]) && (sparc_inst_rd (code [-2]) == sparc_i0)) {
                /* or reg, imm, %i0 */
@@ -4168,7 +4198,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
        while (cfg->code_len + code_size > (cfg->code_size - 16)) {
                cfg->code_size *= 2;
                cfg->native_code = g_realloc (cfg->native_code, cfg->code_size);
-               mono_jit_stats.code_reallocs++;
+               cfg->stat_code_reallocs++;
        }
 
        code = (guint32*)(cfg->native_code + cfg->code_len);
@@ -4306,8 +4336,10 @@ mono_arch_get_lmf_addr (void)
 #endif
 
 void
-mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
+mono_arch_tls_init (void)
 {
+       MonoJitTlsData *jit_tls;
+
        if (!lmf_addr_key_inited) {
                int res;
 
@@ -4322,65 +4354,30 @@ mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
 
        }
 
+       jit_tls = mono_get_jit_tls ();
+
 #ifdef MONO_SPARC_THR_TLS
-       thr_setspecific (lmf_addr_key, &tls->lmf);
+       thr_setspecific (lmf_addr_key, &jit_tls->lmf);
 #else
-       pthread_setspecific (lmf_addr_key, &tls->lmf);
+       pthread_setspecific (lmf_addr_key, &jit_tls->lmf);
 #endif
 }
 
 void
-mono_arch_free_jit_tls_data (MonoJitTlsData *tls)
+mono_arch_finish_init (void)
 {
 }
 
 void
-mono_arch_emit_this_vret_args (MonoCompile *cfg, MonoCallInst *call, int this_reg, int this_type, int vt_reg)
+mono_arch_free_jit_tls_data (MonoJitTlsData *tls)
 {
-       int this_out_reg = sparc_o0;
-
-       if (vt_reg != -1) {
-#ifdef SPARCV9
-               MonoInst *ins;
-               MONO_INST_NEW (cfg, ins, OP_MOVE);
-               ins->sreg1 = vt_reg;
-               ins->dreg = mono_regstate_next_int (cfg->rs);
-               mono_bblock_add_inst (cfg->cbb, ins);
-
-               mono_call_inst_add_outarg_reg (cfg, call, ins->dreg, sparc_o0, FALSE);
-
-               this_out_reg = sparc_o1;
-#else
-               /* Set the 'struct/union return pointer' location on the stack */
-               MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI4_MEMBASE_REG, sparc_sp, 64, vt_reg);
-#endif
-       }
-
-       /* add the this argument */
-       if (this_reg != -1) {
-               MonoInst *this;
-               MONO_INST_NEW (cfg, this, OP_MOVE);
-               this->type = this_type;
-               this->sreg1 = this_reg;
-               this->dreg = mono_regstate_next_int (cfg->rs);
-               mono_bblock_add_inst (cfg->cbb, this);
-
-               mono_call_inst_add_outarg_reg (cfg, call, this->dreg, this_out_reg, FALSE);
-       }
 }
 
-
 MonoInst*
-mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args)
+mono_arch_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args)
 {
        MonoInst *ins = NULL;
 
-       if (cmethod->klass == mono_defaults.thread_class &&
-               strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               if (sparcv9)
-                       MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
-       }
-
        return ins;
 }
 
@@ -4396,7 +4393,7 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethod
  * Returns the size of the activation frame.
  */
 int
-mono_arch_get_argument_info (MonoMethodSignature *csig, int param_count, MonoJitArgumentInfo *arg_info)
+mono_arch_get_argument_info (MonoGenericSharingContext *gsctx, MonoMethodSignature *csig, int param_count, MonoJitArgumentInfo *arg_info)
 {
        int k, align;
        CallInfo *cinfo;
@@ -4427,12 +4424,15 @@ mono_arch_print_tree (MonoInst *tree, int arity)
        return 0;
 }
 
-MonoInst* mono_arch_get_domain_intrinsic (MonoCompile* cfg)
+mgreg_t
+mono_arch_context_get_int_reg (MonoContext *ctx, int reg)
 {
-       return NULL;
+       /* FIXME: implement */
+       g_assert_not_reached ();
 }
 
-MonoInst* mono_arch_get_thread_intrinsic (MonoCompile* cfg)
+gboolean
+mono_arch_opcode_supported (int opcode)
 {
-       return NULL;
+       return FALSE;
 }