Don't run test-318 with gmcs.
[mono.git] / mono / mini / mini-s390.c
index 00777851161cce1a8c9bffdb9cd9ac87de7b1612..cc377e1ca102362a4618efd94330df2e9ca94e02 100644 (file)
 /*------------------------------------------------------------------*/
 
 #define NOT_IMPLEMENTED(x) \
-        g_error ("FIXME: %s is not yet implemented. (trampoline)", x);
+        g_error ("FIXME: %s is not yet implemented.", x);
 
 #define EMIT_COND_BRANCH(ins,cond)                                                     \
+{                                                                                      \
 if (ins->flags & MONO_INST_BRLABEL) {                                                  \
         if (ins->inst_i0->inst_c0) {                                                   \
                int displace;                                                           \
@@ -51,9 +52,11 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                        \
                                     MONO_PATCH_INFO_BB, ins->inst_true_bb);            \
                s390_jcl (code, cond, 0);                                               \
         }                                                                              \
+}                                                                                      \
 }
 
 #define EMIT_UNCOND_BRANCH(ins)                                                        \
+{                                                                                      \
 if (ins->flags & MONO_INST_BRLABEL) {                                                  \
         if (ins->inst_i0->inst_c0) {                                                   \
                int displace;                                                           \
@@ -83,6 +86,7 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                         \
                                     MONO_PATCH_INFO_BB, ins->inst_target_bb);          \
                s390_jcl (code, S390_CC_UN, 0);                                         \
         }                                                                              \
+}                                                                                      \
 }
 
 #define EMIT_COND_SYSTEM_EXCEPTION(cond,exc_name)                      \
@@ -94,18 +98,18 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                       \
 
 #undef DEBUG
 #define DEBUG(a) if (cfg->verbose_level > 1) a
-#define reg_is_freeable(r) ((r) >= 3 && (r) <= 10)
-#define freg_is_freeable(r) ((r) >= 1 && (r) <= 14)
 
 /*----------------------------------------*/
-/* use s390_r3-s390_r10 as temp registers */
+/* use s390_r2-s390_r5 as temp registers  */
 /*----------------------------------------*/
-#define S390_CALLER_REGS  (0x03f8)
+#define S390_CALLER_REGS  (0x10fc)
+#define reg_is_freeable(r) (S390_CALLER_REGS & 1 << (r))
 
 /*----------------------------------------*/
-/* use s390_f2-s390_f14 as temp registers */
+/* use s390_f1/s390_f3-s390_f15 as temps  */
 /*----------------------------------------*/
-#define S390_CALLER_FREGS (0x73f8)
+#define S390_CALLER_FREGS (0xfffa)
+#define freg_is_freeable(r) ((r) >= 1 && (r) <= 14)
 
 #define S390_TRACE_STACK_SIZE (5*sizeof(gint32)+3*sizeof(gdouble))
 
@@ -120,6 +124,8 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                       \
 
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/debug-helpers.h>
+#include <mono/metadata/profiler-private.h>
+#include <mono/utils/mono-math.h>
 
 #include "mini-s390.h"
 #include "inssel.h"
@@ -201,8 +207,9 @@ typedef struct {
 /*                   P r o t o t y p e s                            */
 /*------------------------------------------------------------------*/
 
-static guint32 *emit_memcpy (guint8 *, int, int, int, int, int);
+static guint32 * emit_memcpy (guint8 *, int, int, int, int, int);
 static void indent (int);
+static guint8 * backUpStackPtr(MonoCompile *, guint8 *);
 static void decodeParm (MonoType *, void *, int);
 static void enter_method (MonoMethod *, RegParm *, char *);
 static void leave_method (MonoMethod *, ...);
@@ -239,6 +246,8 @@ static int indent_level = 0;
 
 static const char*const * ins_spec = s390;
 
+static gboolean tls_offset_inited = FALSE;
+
 /*====================== End of Global Variables ===================*/
 
 /*------------------------------------------------------------------*/
@@ -380,6 +389,33 @@ mono_arch_get_argument_info (MonoMethodSignature *csig,
 
 /*========================= End of Function ========================*/
 
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name                - backStackPtr.                                     */
+/*                                                                  */
+/* Function    - Restore Stack Pointer to previous frame.          */
+/*                                                                  */
+/*------------------------------------------------------------------*/
+
+static inline guint8 *
+backUpStackPtr(MonoCompile *cfg, guint8 *code)
+{
+       int stackSize = cfg->stack_usage;
+
+       if (s390_is_uimm16 (cfg->stack_usage)) {
+               s390_ahi  (code, STK_BASE, cfg->stack_usage);
+       } else { 
+               while (stackSize > 32767) {
+                       s390_ahi  (code, STK_BASE, 32767);
+                       stackSize -= 32767;
+               }
+               s390_ahi  (code, STK_BASE, stackSize);
+       }
+       return (code);
+}
+
+/*========================= End of Function ========================*/
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - indent                                            */
@@ -436,10 +472,10 @@ enum_parmtype:
                                printf ("[CHAR:%p], ", *((int *) curParm));
                                break;
                        case MONO_TYPE_I1 :
-                               printf ("[INT1:%d], ", *((int *) curParm+3));
+                               printf ("[INT1:%d], ", *((int *) curParm));
                                break; 
                        case MONO_TYPE_I2 :
-                               printf ("[INT2:%d], ", *((int *) curParm+2));
+                               printf ("[INT2:%d], ", *((int *) curParm));
                                break; 
                        case MONO_TYPE_I4 :
                                printf ("[INT4:%d], ", *((int *) curParm));
@@ -448,10 +484,13 @@ enum_parmtype:
                                printf ("[UINT1:%ud], ", *((unsigned int *) curParm));
                                break; 
                        case MONO_TYPE_U2 :
-                               printf ("[UINT2:%ud], ", *((unsigned int *) curParm));
+                               printf ("[UINT2:%ud], ", *((guint16 *) curParm));
                                break; 
                        case MONO_TYPE_U4 :
-                               printf ("[UINT4:%ud], ", *((unsigned int *) curParm));
+                               printf ("[UINT4:%ud], ", *((guint32 *) curParm));
+                               break; 
+                       case MONO_TYPE_U8 :
+                               printf ("[UINT8:%ul], ", *((guint64 *) curParm));
                                break; 
                        case MONO_TYPE_STRING : {
                                MonoString *s = *((MonoString **) curParm);
@@ -539,22 +578,25 @@ enum_parmtype:
 static void
 enter_method (MonoMethod *method, RegParm *rParm, char *sp)
 {
-       int i, oParm = 0;
+       int i, oParm = 0, iParm = 0;
        MonoClass *class;
        MonoObject *obj;
        MonoJitArgumentInfo *arg_info;
        MonoMethodSignature *sig;
        char *fname;
+       guint32 ip;
        CallInfo *cinfo;
        ArgInfo *ainfo;
        size_data sz;
+       void *curParm;
 
        fname = mono_method_full_name (method, TRUE);
        indent (1);
        printf ("ENTER: %s(", fname);
        g_free (fname);
 
-       printf (") ip: %p\n", __builtin_return_address (1));
+       ip  = (*(guint32 *) (sp+S390_RET_ADDR_OFFSET)) & 0x7fffffff;
+       printf (") ip: %p sp: %p - ", ip, sp); 
 
        if (rParm == NULL)
                return;
@@ -565,11 +607,11 @@ enter_method (MonoMethod *method, RegParm *rParm, char *sp)
 
        if (cinfo->struct_ret) {
                printf ("[VALUERET:%p], ", rParm->gr[0]);
-               oParm = 1;
+               iParm = 1;
        }
 
        if (sig->hasthis) {
-               gpointer *this = (gpointer *) rParm->gr[oParm];
+               gpointer *this = (gpointer *) rParm->gr[iParm];
                obj = (MonoObject *) this;
                if (method->klass->valuetype) { 
                        if (obj) {
@@ -594,7 +636,7 @@ enter_method (MonoMethod *method, RegParm *rParm, char *sp)
        }
                                        
        for (i = 0; i < sig->param_count; ++i) {
-               ainfo = cinfo->args + i + oParm;
+               ainfo = cinfo->args + (i + oParm);
                switch (ainfo->regtype) {
                        case RegTypeGeneral :
                                decodeParm(sig->params[i], &(rParm->gr[ainfo->reg-2]), ainfo->size);
@@ -607,26 +649,37 @@ enter_method (MonoMethod *method, RegParm *rParm, char *sp)
                                break;
                        case RegTypeStructByVal :
                                if (ainfo->reg != STK_BASE) 
-                                       decodeParm(sig->params[i], 
-                                                  &(rParm->gr[ainfo->reg-2]), 
-                                                  ainfo->size);
+                                       curParm = &(rParm->gr[ainfo->reg-2]);
                                else
-                                       switch (ainfo->vtsize) {
-                                               case 0:
-                                               case 1:
-                                               case 2:
-                                               case 4:
-                                               case 8:
-                                                       decodeParm(sig->params[i], 
-                                                          sp+ainfo->offset,
-                                                          ainfo->vtsize);
-                                                       break;
-                                               default:
-                                                       decodeParm(sig->params[i], 
-                                                          *((char **) (sp+ainfo->offset)),
-                                                          ainfo->vtsize);
+                                       curParm = sp+ainfo->offset;
+
+                               switch (ainfo->vtsize) {
+                                       case 0:
+                                       case 1:
+                                       case 2:
+                                       case 4:
+                                       case 8:
+                                               decodeParm(sig->params[i], 
+                                                  curParm,
+                                                  ainfo->size);
+                                               break;
+                                       default:
+                                               decodeParm(sig->params[i], 
+                                                  *((char **) curParm),
+                                                  ainfo->vtsize);
                                        }
                                break;
+                       case RegTypeStructByAddr :
+                               if (ainfo->reg != STK_BASE) 
+                                       curParm = &(rParm->gr[ainfo->reg-2]);
+                               else
+                                       curParm = sp+ainfo->offset;
+
+                               decodeParm(sig->params[i], 
+                                          *((char **) curParm),
+                                          ainfo->vtsize);
+                               break;
+                               
                        default :
                                printf("???, ");
                }
@@ -650,6 +703,7 @@ leave_method (MonoMethod *method, ...)
 {
        MonoType *type;
        char *fname;
+       guint32 ip;
        va_list ap;
 
        va_start(ap, method);
@@ -711,13 +765,13 @@ handle_enum:
        }
        case MONO_TYPE_I: {
                int *val = va_arg (ap, int*);
-               printf ("[INT:%p]", val);
+               printf ("[INT:%d]", val);
                printf("]");
                break;
        }
        case MONO_TYPE_U: {
                int *val = va_arg (ap, int*);
-               printf ("[UINT:%p]", val);
+               printf ("[UINT:%d]", val);
                printf("]");
                break;
        }
@@ -762,9 +816,14 @@ handle_enum:
                printf ("[LONG:%lld]", l);
                break;
        }
+       case MONO_TYPE_R4: {
+               double f = va_arg (ap, double);
+               printf ("[FLOAT4:%f]\n", (float) f);
+               break;
+       }
        case MONO_TYPE_R8: {
                double f = va_arg (ap, double);
-               printf ("[FP:%g]\n", f);
+               printf ("[FLOAT8:%g]\n", f);
                break;
        }
        case MONO_TYPE_VALUETYPE: 
@@ -782,10 +841,12 @@ handle_enum:
                }
                break;
        default:
-               printf ("(unknown return type %x)", method->signature->ret->type);
+               printf ("(unknown return type %x)", 
+                       method->signature->ret->type);
        }
 
-       printf (" ip: %p\n", __builtin_return_address (0));
+       ip = ((gint32) __builtin_return_address (0)) & 0x7fffffff;
+       printf (" ip: %p\n", ip);
 }
 
 /*========================= End of Function ========================*/
@@ -802,6 +863,13 @@ handle_enum:
 void
 mono_arch_cpu_init (void)
 {
+       guint mode = 1;
+
+       /*--------------------------------------*/      
+       /* Set default rounding mode for FP     */
+       /*--------------------------------------*/      
+       __asm__ ("SRNM\t%0\n\t"
+               : : "m" (mode));
 }
 
 /*========================= End of Function ========================*/
@@ -819,8 +887,11 @@ mono_arch_cpu_optimizazions (guint32 *exclude_mask)
 {
        guint32 opts = 0;
 
-       /* no s390-specific optimizations yet */
+       /*----------------------------------------------------------*/
+       /* no s390-specific optimizations yet                       */
+       /*----------------------------------------------------------*/
        *exclude_mask = MONO_OPT_INLINE|MONO_OPT_LINEARS;
+//     *exclude_mask = MONO_OPT_INLINE;
        return opts;
 }
 
@@ -910,10 +981,12 @@ GList *
 mono_arch_get_global_int_regs (MonoCompile *cfg)
 {
        GList *regs = NULL;
-       int i, top = 12;
+       int i, top = 13;
 
-       for (i = 3; i < top; ++i)
-               regs = g_list_prepend (regs, GUINT_TO_POINTER (i));
+       for (i = 8; i < top; ++i) {
+               if (cfg->frame_reg != i)
+                       regs = g_list_prepend (regs, GUINT_TO_POINTER (i));
+       }
 
        return regs;
 }
@@ -956,8 +1029,8 @@ add_general (guint *gr, size_data *sz, ArgInfo *ainfo, gboolean simple)
                        sz->stack_size += sizeof(int);
                        sz->code_size  += 12;    
                } else {
-                       ainfo->reg     = *gr;
-                       sz->code_size += 8;    
+                       ainfo->reg      = *gr;
+                       sz->code_size  += 8;    
                }
        } else {
                if (*gr > S390_LAST_ARG_REG - 1) {
@@ -968,8 +1041,8 @@ add_general (guint *gr, size_data *sz, ArgInfo *ainfo, gboolean simple)
                        sz->stack_size += sizeof(long long);
                        sz->code_size  += 10;   
                } else {
-                       ainfo->reg     = *gr;
-                       sz->code_size += 8;
+                       ainfo->reg      = *gr;
+                       sz->code_size  += 8;
                }
                (*gr) ++;
        }
@@ -1000,22 +1073,26 @@ calculate_sizes (MonoMethodSignature *sig, size_data *sz,
 
        fr                = 0;
        gr                = s390_r2;
+       nParm             = 0;
        cinfo->struct_ret = 0;
        sz->retStruct     = 0;
        sz->stack_size    = S390_MINIMAL_STACK_SIZE;
        sz->code_size     = 0;
-       sz->local_size    = S390_MINIMAL_STACK_SIZE;
+       sz->local_size    = 0;
 
-       nParm = 0;
        /*----------------------------------------------------------*/
        /* We determine the size of the return code/stack in case we*/
        /* need to reserve a register to be used to address a stack */
        /* area that the callee will use.                           */
        /*----------------------------------------------------------*/
 
-       if (sig->ret->byref || string_ctor) {
-               sz->code_size += 8;
-       } else {
+//     if (sig->ret->byref || string_ctor) {
+//             sz->code_size += 8;
+//             add_general (&gr, sz, cinfo->args+nParm, TRUE);
+//             cinfo->args[nParm].size = sizeof(gpointer);
+//             nParm++;
+//     } else {
+       {
                simpletype = sig->ret->type;
 enum_retvalue:
                switch (simpletype) {
@@ -1065,6 +1142,7 @@ enum_retvalue:
                        sz->stack_size   += S390_ALIGN(size, align);
                        gr++;
                         break;
+               case MONO_TYPE_TYPEDBYREF:
                case MONO_TYPE_VOID:
                        break;
                default:
@@ -1153,25 +1231,29 @@ enum_retvalue:
                                case 2:
                                case 4:
                                        add_general(&gr, sz, cinfo->args+nParm, TRUE);
-                                       cinfo->args[nParm].size   = sizeof(int);
+                                       cinfo->args[nParm].size    = size;
                                        cinfo->args[nParm].regtype = RegTypeStructByVal; 
                                        nParm++;
+                                       sz->local_size            += sizeof(long);
                                        break;
                                case 8:
                                        add_general(&gr, sz, cinfo->args+nParm, FALSE);
-                                       cinfo->args[nParm].size = sizeof(long long);
+                                       cinfo->args[nParm].size    = sizeof(long long);
                                        cinfo->args[nParm].regtype = RegTypeStructByVal; 
                                        nParm++;
+                                       sz->local_size            += sizeof(long);
                                        break;
                                default:
                                        add_general(&gr, sz, cinfo->args+nParm, TRUE);
                                        cinfo->args[nParm].size    = sizeof(int);
-                                       cinfo->args[nParm].regtype = RegTypeStructByVal
+                                       cinfo->args[nParm].regtype = RegTypeStructByAddr
                                        cinfo->args[nParm].vtsize  = size;
-                                       sz->code_size  += 40;
+                                       sz->code_size             += 40;
+                                       sz->local_size            += size;
+                                       if (cinfo->args[nParm].reg == STK_BASE)
+                                               sz->local_size += sizeof(gpointer);
                                        nParm++;
                        }
-                       sz->local_size += sizeof(long);
                        break;
                case MONO_TYPE_I8:
                case MONO_TYPE_U8:
@@ -1192,7 +1274,7 @@ enum_retvalue:
                                cinfo->args[nParm].reg     = STK_BASE;
                                cinfo->args[nParm].regtype = RegTypeBase;
                                sz->code_size  += 4;
-                               sz->stack_size += 4;
+                               sz->stack_size += sizeof(float);
                        }
                        nParm++;
                        break;
@@ -1204,13 +1286,11 @@ enum_retvalue:
                                sz->code_size += 4;
                                fr += 2;
                        } else {
-                               sz->stack_size  = S390_ALIGN(sz->stack_size, 
-                                                            S390_STACK_ALIGNMENT);
                                cinfo->args[nParm].offset  = sz->stack_size;
                                cinfo->args[nParm].reg     = STK_BASE;
                                cinfo->args[nParm].regtype = RegTypeBase;
                                sz->code_size  += 4;
-                               sz->stack_size += 8;
+                               sz->stack_size += sizeof(double);
                        }
                        nParm++;
                        break;
@@ -1219,10 +1299,8 @@ enum_retvalue:
                }
        }
 
-
-       /* align stack size */
-       sz->stack_size = S390_ALIGN(sz->stack_size, S390_STACK_ALIGNMENT);
-       cinfo->stack_usage = sz->stack_size;
+       cinfo->stack_usage = S390_ALIGN(sz->stack_size+sz->local_size, 
+                                       S390_STACK_ALIGNMENT);
        return (cinfo);
 }
 
@@ -1241,7 +1319,7 @@ enum_retvalue:
 /*------------------------------------------------------------------*/
 
 void
-mono_arch_allocate_vars (MonoCompile *m)
+mono_arch_allocate_vars (MonoCompile *cfg)
 {
        MonoMethodSignature *sig;
        MonoMethodHeader *header;
@@ -1252,41 +1330,41 @@ mono_arch_allocate_vars (MonoCompile *m)
        int frame_reg = STK_BASE;
        int sArg, eArg;
 
-       header  = ((MonoMethodNormal *)m->method)->header;
-
-       /* 
-        * We use the frame register also for any method that has
-        * filter clauses. This way, when the handlers are called,
-        * the code will reference local variables using the frame reg instead of
-        * the stack pointer: if we had to restore the stack pointer, we'd
-        * corrupt the method frames that are already on the stack (since
-        * filters get called before stack unwinding happens) when the filter
-        * code would call any method.
-        */ 
-//     if ((m->flags & MONO_CFG_HAS_ALLOCA) || header->num_clauses)
-       if (m->flags & MONO_CFG_HAS_ALLOCA) 
+       header  = mono_method_get_header (cfg->method);
+
+       /*---------------------------------------------------------*/    
+       /* We use the frame register also for any method that has  */ 
+       /* filter clauses. This way, when the handlers are called, */
+       /* the code will reference local variables using the frame */
+       /* reg instead of the stack pointer: if we had to restore  */
+       /* the stack pointer, we'd corrupt the method frames that  */
+       /* are already on the stack (since filters get called      */
+       /* before stack unwinding happens) when the filter code    */
+       /* would call any method.                                  */
+       /*---------------------------------------------------------*/    
+       if ((cfg->flags & MONO_CFG_HAS_ALLOCA) || header->num_clauses)
                frame_reg = s390_r11;
 
-       m->frame_reg = frame_reg;
+       cfg->frame_reg = frame_reg;
 
        if (frame_reg != STK_BASE) 
-               m->used_int_regs |= 1 << frame_reg;             
+               cfg->used_int_regs |= 1 << frame_reg;           
 
-       sig     = m->method->signature;
+       sig     = cfg->method->signature;
        
        cinfo   = calculate_sizes (sig, &sz, sig->pinvoke);
 
        if (cinfo->struct_ret) {
-               m->ret->opcode = OP_REGVAR;
-               m->ret->inst_c0 = s390_r2;
+               cfg->ret->opcode = OP_REGVAR;
+               cfg->ret->inst_c0 = s390_r2;
        } else {
                /* FIXME: handle long and FP values */
                switch (sig->ret->type) {
                case MONO_TYPE_VOID:
                        break;
                default:
-                       m->ret->opcode = OP_REGVAR;
-                       m->ret->dreg    = s390_r2;
+                       cfg->ret->opcode = OP_REGVAR;
+                       cfg->ret->dreg   = s390_r2;
                        break;
                }
        }
@@ -1298,10 +1376,10 @@ mono_arch_allocate_vars (MonoCompile *m)
        /* to point at the local variables.                             */
        /* add parameter area size for called functions                 */
        /*--------------------------------------------------------------*/
-       offset = (m->param_area + S390_MINIMAL_STACK_SIZE);
+       offset = (cfg->param_area + S390_MINIMAL_STACK_SIZE);
 
        if (cinfo->struct_ret) {
-               inst               = m->ret;
+               inst               = cfg->ret;
                offset             = S390_ALIGN(offset, sizeof(gpointer));
                inst->inst_offset  = offset;
                inst->opcode       = OP_REGOFFSET;
@@ -1310,7 +1388,7 @@ mono_arch_allocate_vars (MonoCompile *m)
        }
 
        if (sig->hasthis) {
-               inst = m->varinfo [0];
+               inst = cfg->varinfo [0];
                if (inst->opcode != OP_REGVAR) {
                        inst->opcode       = OP_REGOFFSET;
                        inst->inst_basereg = frame_reg;
@@ -1326,23 +1404,24 @@ mono_arch_allocate_vars (MonoCompile *m)
        eArg = sig->param_count + sArg;
 
        for (iParm = sArg; iParm < eArg; ++iParm) {
-               inst = m->varinfo [curinst];
+               inst = cfg->varinfo [curinst];
                if (inst->opcode != OP_REGVAR) {
-                       if (cinfo->args[iParm].regtype == RegTypeStructByVal) {
-                               if (cinfo->args[iParm].vtsize != 0) {
+                       switch (cinfo->args[iParm].regtype) {
+                               case RegTypeStructByAddr :
                                        inst->opcode       = OP_S390_LOADARG;
                                        inst->inst_basereg = frame_reg;
-                                       size               = sizeof(long);
+                                       size               = abs(cinfo->args[iParm].vtsize);
                                        offset             = S390_ALIGN(offset, size);
                                        inst->inst_offset  = offset; 
-                               } else {
+                                       break;
+                               case RegTypeStructByVal :
                                        inst->opcode       = OP_S390_ARGPTR;
                                        inst->inst_basereg = frame_reg;
                                        size               = cinfo->args[iParm].size;
                                        offset             = S390_ALIGN(offset, size);
                                        inst->inst_offset  = offset;
-                               }
-                       } else {
+                                       break;
+                               default :
                                if (cinfo->args[iParm].reg != STK_BASE) {
                                        inst->opcode       = OP_REGOFFSET;
                                        inst->inst_basereg = frame_reg;
@@ -1359,7 +1438,6 @@ mono_arch_allocate_vars (MonoCompile *m)
                                                              : 0);
                                        inst->inst_offset  = cinfo->args[iParm].offset + 
                                                             size;
-//                                     inst->unused       = stackOffset;
                                        inst->unused       = 0;
                                        size               = sizeof(long);
                                } 
@@ -1369,14 +1447,18 @@ mono_arch_allocate_vars (MonoCompile *m)
                curinst++;
        }
 
-       curinst = m->locals_start;
-       for (iVar = curinst; iVar < m->num_varinfo; ++iVar) {
-               inst = m->varinfo [iVar];
-               if (inst->opcode == OP_REGVAR)
+       curinst = cfg->locals_start;
+       for (iVar = curinst; iVar < cfg->num_varinfo; ++iVar) {
+               inst = cfg->varinfo [iVar];
+               if ((inst->flags & MONO_INST_IS_DEAD) || 
+                   (inst->opcode == OP_REGVAR))
                        continue;
 
-               /* inst->unused indicates native sized value types, this is used by the
-               * pinvoke wrappers when they call functions returning structure */
+               /*--------------------------------------------------*/
+               /* inst->unused indicates native sized value types, */
+               /* this is used by the pinvoke wrappers when they   */
+               /* call functions returning structure               */
+               /*--------------------------------------------------*/
                if (inst->unused && MONO_TYPE_ISSTRUCT (inst->inst_vtype))
                        size = mono_class_native_size (inst->inst_vtype->data.klass, &align);
                else
@@ -1387,31 +1469,25 @@ mono_arch_allocate_vars (MonoCompile *m)
                inst->opcode       = OP_REGOFFSET;
                inst->inst_basereg = frame_reg;
                offset            += size;
-               //DEBUG (g_print("allocating local %d to %d\n", iVar, inst->inst_offset));
+               DEBUG (g_print("allocating local %d to %d\n", iVar, inst->inst_offset));
        }
 
-//     if (sig->hasthis) 
-//             curinst = sArg = 1;
-//     else 
-//             curinst = sArg = 0;
-//
-
        /*------------------------------------------------------*/
        /* Allow space for the trace method stack area if needed*/
        /*------------------------------------------------------*/
-       if (mono_jit_trace_calls != NULL && mono_trace_eval (m)) 
+       if (mono_jit_trace_calls != NULL && mono_trace_eval (cfg)) 
                offset += S390_TRACE_STACK_SIZE;
 
        /*------------------------------------------------------*/
        /* Reserve space to save LMF and caller saved registers */
        /*------------------------------------------------------*/
-       if (m->method->save_lmf)
+       if (cfg->method->save_lmf)
                offset += sizeof (MonoLMF);
 
        /*------------------------------------------------------*/
        /* align the offset                                     */
        /*------------------------------------------------------*/
-       m->stack_offset = S390_ALIGN(offset, S390_STACK_ALIGNMENT);
+       cfg->stack_offset = S390_ALIGN(offset, S390_STACK_ALIGNMENT);
 
 }
 
@@ -1434,7 +1510,8 @@ mono_arch_allocate_vars (MonoCompile *m)
 /*------------------------------------------------------------------*/
 
 MonoCallInst*
-mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call, int is_virtual) {
+mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, 
+                      MonoCallInst *call, int is_virtual) {
        MonoInst *arg, *in;
        MonoMethodSignature *sig;
        int i, n, lParamArea;
@@ -1447,8 +1524,14 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
        DEBUG (g_print ("Call requires: %d parameters\n",n));
        
        cinfo = calculate_sizes (sig, &sz, sig->pinvoke);
+
+       call->stack_usage = cinfo->stack_usage;
+       lParamArea        = cinfo->stack_usage - S390_MINIMAL_STACK_SIZE;
+       cfg->param_area   = MAX (cfg->param_area, lParamArea);
+       cfg->flags       |= MONO_CFG_HAS_CALLS;
+
        if (cinfo->struct_ret)
-               call->used_iregs |= 1 << cinfo->struct_ret;
+               call->used_iregs |= 1 << cinfo->ret.reg;
 
        for (i = 0; i < n; ++i) {
                ainfo = cinfo->args + i;
@@ -1473,8 +1556,12 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
                                if (arg->type == STACK_I8)
                                        call->used_iregs |= 1 << (ainfo->reg + 1);
                        } else if (ainfo->regtype == RegTypeStructByAddr) {
-                               arg->unused = ainfo->reg;
                                call->used_iregs |= 1 << ainfo->reg;
+                               arg->sreg1     = ainfo->reg;
+                               arg->opcode    = OP_OUTARG_VT;
+                               arg->unused    = -ainfo->vtsize;
+                               arg->inst_imm  = ainfo->offset;
+                               arg->sreg2     = ainfo->offparm + S390_MINIMAL_STACK_SIZE;
                        } else if (ainfo->regtype == RegTypeStructByVal) {
                                if (ainfo->reg != STK_BASE) {
                                        switch (ainfo->size) {
@@ -1488,31 +1575,32 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
                                                call->used_iregs |= 1 << ainfo->reg;
                                                call->used_iregs |= 1 << (ainfo->reg+1);
                                                break;
+                                       default:
+                                               call->used_iregs |= 1 << ainfo->reg;
                                        }
                                } 
-                               arg->sreg1    = ainfo->reg;
-                               arg->opcode   = OP_OUTARG_VT;
-                               if (ainfo->vtsize != 0)
-                                       arg->unused = -ainfo->vtsize;
-                               else
-                                       arg->unused = ainfo->size;
-                               arg->inst_imm     = ainfo->offset;
-                               arg->sreg2        = ainfo->offparm;
+                               arg->sreg1     = ainfo->reg;
+                               arg->opcode    = OP_OUTARG_VT;
+                               arg->unused    = ainfo->size;
+                               arg->inst_imm  = ainfo->offset;
+                               arg->sreg2     = ainfo->offparm + S390_MINIMAL_STACK_SIZE;
                        } else if (ainfo->regtype == RegTypeBase) {
                                arg->opcode = OP_OUTARG;
                                arg->unused = ainfo->reg | (ainfo->size << 8);
                                arg->inst_imm = ainfo->offset;
+                               call->used_fregs |= 1 << ainfo->reg;
                        } else if (ainfo->regtype == RegTypeFP) {
-                               arg->opcode = OP_OUTARG_R8;
                                arg->unused = ainfo->reg;
                                call->used_fregs |= 1 << ainfo->reg;
                                if (ainfo->size == 4) {
-                                       /* we reduce the precision */
                                        MonoInst *conv;
+                                       arg->opcode     = OP_OUTARG_R4;
                                        MONO_INST_NEW (cfg, conv, OP_FCONV_TO_R4);
                                        conv->inst_left = arg->inst_left;
-                                       arg->inst_left = conv;
+                                       arg->inst_left  = conv;
                                }
+                               else
+                                       arg->opcode = OP_OUTARG_R8;
                        } else {
                                g_assert_not_reached ();
                        }
@@ -1531,15 +1619,6 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
                }
                call->out_args = prev;
        }
-       call->stack_usage = cinfo->stack_usage;
-
-       lParamArea        = cinfo->stack_usage - S390_MINIMAL_STACK_SIZE;
-       cfg->param_area   = MAX (cfg->param_area, lParamArea);
-       cfg->flags       |= MONO_CFG_HAS_CALLS;
-       /*----------------------------------------------------------*/ 
-       /* should set more info in call, such as the stack space    */
-       /* used by the args that needs to be added back to esp      */
-       /*----------------------------------------------------------*/ 
 
        g_free (cinfo);
        return call;
@@ -2463,10 +2542,10 @@ mono_arch_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
        while (ins) {
                spec = ins_spec [ins->opcode];
                DEBUG (print_ins (i, ins));
-               if (spec [MONO_INST_CLOB] == 'c') {
-                       MonoCallInst * call = (MonoCallInst*)ins;
-                       int j;
-               }
+//             if (spec [MONO_INST_CLOB] == 'c') {
+//                     MonoCallInst * call = (MonoCallInst*)ins;
+//                     int j;
+//             }
                if (spec [MONO_INST_SRC1]) {
                        if (spec [MONO_INST_SRC1] == 'f')
                                reginfo1 = reginfof;
@@ -2499,7 +2578,7 @@ mono_arch_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
                        if (reginfod [ins->dreg].born_in == 0 || reginfod [ins->dreg].born_in > i)
                                reginfod [ins->dreg].born_in = i;
                        if (spec [MONO_INST_DEST] == 'l') {
-                               /* result in eax:edx, the virtual register is allocated sequentially */
+                               /* result in R2/R3, the virtual register is allocated sequentially */
                                reginfod [ins->dreg + 1].prev_use = reginfod [ins->dreg + 1].last_use;
                                reginfod [ins->dreg + 1].last_use = i;
                                if (reginfod [ins->dreg + 1].born_in == 0 || reginfod [ins->dreg + 1].born_in > i)
@@ -2648,7 +2727,10 @@ mono_arch_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
                                                create_copy_ins (cfg, ins->dreg, s390_r3, ins);
                                        }
                                }
-                               if (reg_is_freeable (val) && hreg >= 0 && (reginfo [hreg].born_in >= i && !(cur_iregs & (1 << val)))) {
+                               if (reg_is_freeable (val) && 
+                                   hreg >= 0 && 
+                                    (reginfo [hreg].born_in >= i && 
+                                     !(cur_iregs & (1 << val)))) {
                                        DEBUG (g_print ("\tfreeable %s (R%d)\n", mono_arch_regname (val), hreg));
                                        mono_regstate_free_int (rs, val);
                                }
@@ -2681,7 +2763,6 @@ mono_arch_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
                                                /* the register gets spilled after this inst */
                                                spill = -val -1;
                                        }
-                                       //g_assert (val == -1); /* source cannot be spilled */
                                        val = mono_regstate_alloc_float (rs, src1_mask);
                                        if (val < 0)
                                                val = get_float_register_spilling (cfg, tmp, ins, src1_mask, ins->sreg1);
@@ -2806,16 +2887,6 @@ mono_arch_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
                                }
                        }
                }
-               /*if (reg_is_freeable (ins->sreg1) && prev_sreg1 >= 0 && reginfo [prev_sreg1].born_in >= i) {
-                       DEBUG (g_print ("freeable %s\n", mono_arch_regname (ins->sreg1)));
-                       mono_regstate_free_int (rs, ins->sreg1);
-               }
-               if (reg_is_freeable (ins->sreg2) && prev_sreg2 >= 0 && reginfo [prev_sreg2].born_in >= i) {
-                       DEBUG (g_print ("freeable %s\n", mono_arch_regname (ins->sreg2)));
-                       mono_regstate_free_int (rs, ins->sreg2);
-               }*/
-               
-               //DEBUG (print_ins (i, ins));
                tmp = tmp->next;
        }
 }
@@ -2837,18 +2908,40 @@ emit_float_to_int (MonoCompile *cfg, guchar *code, int dreg, int sreg, int size,
        /* sreg is a float, dreg is an integer reg. */
        if (is_signed) {
                s390_cfdbr (code, dreg, 5, sreg);
+               switch (size) {
+                       case 1:
+                               s390_lhi  (code, s390_r0, 0);
+                               s390_lhi  (code, s390_r13, 0xff);
+                               s390_ltr  (code, dreg, dreg);
+                               s390_jnl  (code, 4);
+                               s390_lhi  (code, s390_r0, 0x80);
+                               s390_nr   (code, dreg, s390_r13);
+                               s390_or   (code, dreg, s390_r0);
+                               break;
+               }
        } else {
                s390_basr   (code, s390_r13, 0);
                s390_j      (code, 10);
-               s390_double (code, 0x41e0000000000000);
-               s390_double (code, 0x41f0000000000000);
-               s390_ldr    (code, s390_f0, sreg);
-               s390_cdb    (code, s390_f0, 0, s390_r13, 0);
+               s390_llong  (code, 0x41e0000000000000);
+               s390_llong  (code, 0x41f0000000000000);
+               s390_ldr    (code, s390_f15, sreg);
+               s390_cdb    (code, s390_f15, 0, s390_r13, 0);
                s390_jl     (code, 10);
-               s390_sdb    (code, s390_f0, 0, s390_r13, 8);
-               s390_cfdbr  (code, dreg, 7, s390_f0);
-               s390_j      (code, 5);
+               s390_sdb    (code, s390_f15, 0, s390_r13, 8);
+               s390_cfdbr  (code, dreg, 7, s390_f15);
+               s390_j      (code, 4);
                s390_cfdbr  (code, dreg, 5, sreg);
+               switch (size) {
+                       case 1: 
+                               s390_lhi  (code, s390_r0, 0xff);
+                               s390_nr   (code, dreg, s390_r0);
+                               break;
+                       case 2:
+                               s390_lhi  (code, s390_r0, -1);
+                               s390_srl  (code, s390_r0, 0, 16);
+                               s390_nr   (code, dreg, s390_r0);
+                               break;
+               }
        }
        return code;
 }
@@ -2890,6 +2983,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
        MonoInst *last_ins = NULL;
        guint last_offset = 0;
        int max_len, cpos;
+guint8 cond;
 
        if (cfg->opt & MONO_OPT_PEEPHOLE)
                peephole_pass (cfg, bb);
@@ -2924,52 +3018,57 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        code = cfg->native_code + offset;
                }
 
+               mono_debug_record_line_number (cfg, ins, offset);
+
                switch (ins->opcode) {
-               case OP_STOREI1_MEMBASE_IMM:
-                       s390_lhi (code, s390_r14, ins->inst_imm);
+               case OP_STOREI1_MEMBASE_IMM: {
+                       s390_lhi (code, s390_r0, ins->inst_imm);
                        if (s390_is_uimm12(ins->inst_offset))
-                               s390_stc (code, s390_r14, 0, ins->inst_destbasereg, ins->inst_offset);
+                               s390_stc (code, s390_r0, 0, ins->inst_destbasereg, ins->inst_offset);
                        else {
                                s390_basr (code, s390_r13, 0);
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_offset);
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
-                               s390_stc  (code, s390_r14, s390_r13, ins->inst_destbasereg, 0);
+                               s390_stc  (code, s390_r0, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
-               case OP_STOREI2_MEMBASE_IMM:
-                       s390_lhi (code, s390_r14, ins->inst_imm);
+               case OP_STOREI2_MEMBASE_IMM: {
+                       s390_lhi (code, s390_r0, ins->inst_imm);
                        if (s390_is_uimm12(ins->inst_offset)) {
-                               s390_sth (code, s390_r14, 0, ins->inst_destbasereg, ins->inst_offset);
+                               s390_sth (code, s390_r0, 0, ins->inst_destbasereg, ins->inst_offset);
                        } else {
-                               s390_basr (code, s390_r14, 0);
+                               s390_basr (code, s390_r13, 0);
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_offset);
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
-                               s390_sth  (code, s390_r14, s390_r13, ins->inst_destbasereg, 0);
+                               s390_sth  (code, s390_r0, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
                case OP_STORE_MEMBASE_IMM:
-               case OP_STOREI4_MEMBASE_IMM:
-                       if (s390_is_imm16(ins->inst_imm)) {
-                               s390_lhi  (code, s390_r14, ins->inst_imm);
+               case OP_STOREI4_MEMBASE_IMM: {
+                       if (s390_is_uimm16(ins->inst_imm)) {
+                               s390_lhi  (code, s390_r0, ins->inst_imm);
                        } else {
                                s390_basr (code, s390_r13, 0);
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_imm);
-                               s390_l    (code, s390_r14, 0, s390_r13, 4);
+                               s390_l    (code, s390_r0, 0, s390_r13, 4);
                        }
                        if (s390_is_uimm12(ins->inst_offset)) {
-                               s390_st  (code, s390_r14, 0, ins->inst_destbasereg, ins->inst_offset);
+                               s390_st  (code, s390_r0, 0, ins->inst_destbasereg, ins->inst_offset);
                        } else {
                                s390_basr (code, s390_r13, 0);
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_offset);
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
-                               s390_st   (code, s390_r14, s390_r13, ins->inst_destbasereg, 0);
+                               s390_st   (code, s390_r0, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
-               case OP_STOREI1_MEMBASE_REG:
+               case OP_STOREI1_MEMBASE_REG: {
                        if (s390_is_uimm12(ins->inst_offset)) {
                                s390_stc  (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
                        } else {
@@ -2979,8 +3078,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                                s390_stc  (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
-               case OP_STOREI2_MEMBASE_REG:
+               case OP_STOREI2_MEMBASE_REG: {
                        if (s390_is_uimm12(ins->inst_offset)) {
                                s390_sth  (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
                        } else {
@@ -2990,9 +3090,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                                s390_sth  (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
                case OP_STORE_MEMBASE_REG:
-               case OP_STOREI4_MEMBASE_REG:
+               case OP_STOREI4_MEMBASE_REG: {
                        if (s390_is_uimm12(ins->inst_offset)) {
                                s390_st   (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
                        } else {
@@ -3002,26 +3103,28 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                                s390_st   (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
                case CEE_LDIND_I:
                case CEE_LDIND_I4:
-               case CEE_LDIND_U4:
+               case CEE_LDIND_U4: {
                        s390_basr (code, s390_r13, 0);
                        s390_j    (code, 4);
                        s390_word (code, ins->inst_p0);
                        s390_l    (code, s390_r13, 0, s390_r13, 4);
                        s390_l    (code, ins->dreg, 0, s390_r13, 0);
+               }
                        break;
                case OP_LOADU4_MEM:
                        g_assert_not_reached ();
                        break;
                case OP_LOAD_MEMBASE:
                case OP_LOADI4_MEMBASE:
-               case OP_LOADU4_MEMBASE:
+               case OP_LOADU4_MEMBASE: {
                        if (s390_is_uimm12(ins->inst_offset))
                                s390_l    (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
                        else {
-                               if (s390_is_imm16(ins->inst_offset)) {
+                               if (s390_is_uimm16(ins->inst_offset)) {
                                        s390_lhi (code, s390_r13, ins->inst_offset);
                                        s390_l   (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
                                } else {
@@ -3032,8 +3135,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_l    (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
                                }
                        }
+               }
                        break;
-               case OP_LOADU1_MEMBASE:
+               case OP_LOADU1_MEMBASE: {
                        s390_lhi (code, s390_r0, 0);
                        if (s390_is_uimm12(ins->inst_offset))
                                s390_ic   (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
@@ -3045,8 +3149,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_ic   (code, s390_r0, s390_r13, ins->inst_basereg, 0);
                        }
                        s390_lr   (code, ins->dreg, s390_r0);
+               }
                        break;
-               case OP_LOADI1_MEMBASE:
+               case OP_LOADI1_MEMBASE: {
                        s390_lhi (code, s390_r0, 0);
                        if (s390_is_uimm12(ins->inst_offset))
                                s390_ic   (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
@@ -3063,8 +3168,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        s390_lhi  (code, s390_r13, 0xff00);
                        s390_or   (code, s390_r0, s390_r13);
                        s390_lr   (code, ins->dreg, s390_r0);
+               }
                        break;
-               case OP_LOADU2_MEMBASE:
+               case OP_LOADU2_MEMBASE: {
                        s390_lhi (code, s390_r0, 0);
                        if (s390_is_uimm12(ins->inst_offset))
                                s390_icm  (code, s390_r0, 3, ins->inst_basereg, ins->inst_offset);
@@ -3077,8 +3183,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_icm  (code, s390_r0, 3, s390_r13, 0);
                        }
                        s390_lr  (code, ins->dreg, s390_r0);
+               }
                        break;
-               case OP_LOADI2_MEMBASE:
+               case OP_LOADI2_MEMBASE: {
                        s390_lhi (code, s390_r0, 0);
                        if (s390_is_uimm12(ins->inst_offset))
                                s390_lh   (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
@@ -3090,37 +3197,42 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_lh   (code, s390_r0, s390_r13, ins->inst_basereg, 0);
                        }
                        s390_lr  (code, ins->dreg, s390_r0);
+               }
                        break;
-               case CEE_CONV_I1:
+               case CEE_CONV_I1: {
                        s390_lhi  (code, s390_r0, 0x80);
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_nr   (code, s390_r0, ins->sreg1);
-                       s390_jl   (code, 7);
+                       s390_jz   (code, 7);
                        s390_lhi  (code, s390_r13, -1);
                        s390_sll  (code, s390_r13, 0, 8);
                        s390_or   (code, ins->dreg, s390_r13);
+               }
                        break;
-               case CEE_CONV_I2:
+               case CEE_CONV_I2: {
                        s390_lhi  (code, s390_r0, 0x80);
+                       s390_sll  (code, s390_r0, 0, 8);
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_nr   (code, s390_r0, ins->sreg1);
-                       s390_jl   (code, 7);
+                       s390_jz   (code, 7);
                        s390_lhi  (code, s390_r13, -1);
                        s390_sll  (code, s390_r13, 0, 16);
                        s390_or   (code, ins->dreg, s390_r13);
+               }
                        break;
-               case CEE_CONV_U1:
+               case CEE_CONV_U1: {
                        s390_lhi  (code, s390_r0, 0xff);
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_nr   (code, ins->dreg, s390_r0);
+               }
                        break;
-               case CEE_CONV_U2:
+               case CEE_CONV_U2: {
                        s390_lhi  (code, s390_r0, -1);
                        s390_sll  (code, s390_r0, 0, 16);
                        s390_srl  (code, s390_r0, 0, 16);
@@ -3128,21 +3240,31 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_nr   (code, ins->dreg, s390_r0);
+               }
                        break;
-               case OP_COMPARE:
+               case OP_COMPARE: {
                        if ((ins->next) && 
                            ((ins->next->opcode >= CEE_BNE_UN) &&
-                            (ins->next->opcode <= CEE_BLT_UN)))
+                            (ins->next->opcode <= CEE_BLT_UN)) || 
+                           ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
+                            (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
+                           ((ins->next->opcode == OP_CLT_UN) ||
+                            (ins->next->opcode == OP_CGT_UN)))
                                s390_clr  (code, ins->sreg1, ins->sreg2);
                        else
                                s390_cr   (code, ins->sreg1, ins->sreg2);
+               }
                        break;
-               case OP_COMPARE_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_COMPARE_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                s390_lhi  (code, s390_r0, ins->inst_imm);
                                if ((ins->next) && 
-                                   ((ins->next->opcode >= CEE_BNE_UN) &&
-                                   (ins->next->opcode <= CEE_BLT_UN)))
+                                   ((ins->next->opcode >= CEE_BNE_UN) &&
+                                    (ins->next->opcode <= CEE_BLT_UN)) || 
+                                   ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
+                                    (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
+                                   ((ins->next->opcode == OP_CLT_UN) ||
+                                    (ins->next->opcode == OP_CGT_UN)))
                                        s390_clr  (code, ins->sreg1, s390_r0);
                                else
                                        s390_cr   (code, ins->sreg1, s390_r0);
@@ -3152,38 +3274,49 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_imm);
                                if ((ins->next) && 
-                                   ((ins->next->opcode >= CEE_BNE_UN) &&
-                                   (ins->next->opcode <= CEE_BLT_UN)))
+                                   ((ins->next->opcode >= CEE_BNE_UN) &&
+                                    (ins->next->opcode <= CEE_BLT_UN)) || 
+                                   ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
+                                    (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
+                                   ((ins->next->opcode == OP_CLT_UN) &&
+                                    (ins->next->opcode == OP_CGT_UN)))
                                        s390_cl   (code, ins->sreg1, 0, s390_r13, 4);
                                else
                                        s390_c    (code, ins->sreg1, 0, s390_r13, 4);
                        }
+               }
                        break;
-               case OP_X86_TEST_NULL:
+               case OP_X86_TEST_NULL: {
                        s390_ltr (code, ins->sreg1, ins->sreg1);
+               }
                        break;
-               case CEE_BREAK:
+               case CEE_BREAK: {
                        s390_break (code);
+               }
                        break;
-               case OP_ADDCC:
+               case OP_ADDCC: {
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_alr  (code, ins->dreg, ins->sreg2);
+               }
                        break;
-               case CEE_ADD:
+               case CEE_ADD: {
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_ar   (code, ins->dreg, ins->sreg2);
+               }
                        break;
-               case OP_ADC:
+               case OP_ADC: {
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_alcr (code, ins->dreg, ins->sreg2);
+               }
                        break;
-               case OP_ADD_IMM:
+               case OP_ADDCC_IMM:
+               case OP_ADD_IMM: {
                        if ((ins->next) &&
                            (ins->next->opcode == OP_ADC_IMM)) {
                                s390_basr (code, s390_r13, 0);
@@ -3194,7 +3327,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                }
                                s390_al   (code, ins->dreg, 0, s390_r13, 4);
                        } else {
-                               if (s390_is_imm16 (ins->inst_imm)) {
+                               if (s390_is_uimm16 (ins->inst_imm)) {
                                        if (ins->dreg != ins->sreg1) {
                                                s390_lr   (code, ins->dreg, ins->sreg1);
                                        }
@@ -3209,9 +3342,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_a    (code, ins->dreg, 0, s390_r13, 4);
                                }
                        }
+               }
                        break;
-               case OP_ADC_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_ADC_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                if (ins->dreg != ins->sreg1) {
                                        s390_lr   (code, ins->dreg, ins->sreg1);
                                } 
@@ -3224,27 +3358,85 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                                s390_alcr (code, ins->dreg, s390_r13);
                        }
+               }
+                       break;
+               case CEE_ADD_OVF: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_ar   (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+               }
                        break;
-               case OP_SUBCC:
+               case CEE_ADD_OVF_UN: {
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
-                       s390_sr (code, ins->dreg, ins->sreg2);
+                       s390_alr  (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_CY, "OverflowException");
+               }
                        break;
-               case CEE_SUB:
+               case OP_ADD_OVF_CARRY: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_lhi  (code, s390_r0, 0);
+                       s390_lr   (code, s390_r1, s390_r0);
+                       s390_alcr (code, s390_r0, s390_r1);
+                       s390_ar   (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+                       s390_ar   (code, ins->dreg, s390_r0);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+               }
+                       break;
+               case OP_ADD_OVF_UN_CARRY: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_alcr (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_CY, "OverflowException");
+               }
+                       break;
+               case OP_SUBCC: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_slr (code, ins->dreg, ins->sreg2);
+               }
+                       break;
+               case CEE_SUB: {
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_sr   (code, ins->dreg, ins->sreg2);
+               }
                        break;
-               case OP_SBB:
+               case OP_SBB: {
                        if (ins->dreg != ins->sreg1) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_slbr (code, ins->dreg, ins->sreg2);
+               }
+                       break;
+               case OP_SUBCC_IMM: {
+                       if (s390_is_uimm16 (-ins->inst_imm)) {
+                               if (ins->dreg != ins->sreg1) {
+                                       s390_lr   (code, ins->dreg, ins->sreg1);
+                               }
+                               s390_ahi  (code, ins->dreg, -ins->inst_imm);
+                       } else {
+                               s390_basr (code, s390_r13, 0);
+                               s390_j    (code, 4);
+                               s390_word (code, ins->inst_imm);
+                               if (ins->dreg != ins->sreg1) {
+                                       s390_lr   (code, ins->dreg, ins->sreg1);
+                               }
+                               s390_sl   (code, ins->dreg, 0, s390_r13, 4);
+                       }
+               }
                        break;
-               case OP_SUB_IMM:
-                       if (s390_is_imm16 (-ins->inst_imm)) {
+               case OP_SUB_IMM: {
+                       if (s390_is_uimm16 (-ins->inst_imm)) {
                                if (ins->dreg != ins->sreg1) {
                                        s390_lr   (code, ins->dreg, ins->sreg1);
                                }
@@ -3258,14 +3450,61 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                }
                                s390_s    (code, ins->dreg, 0, s390_r13, 4);
                        }
+               }
                        break;
-               case OP_SBB_IMM:
-                       s390_basr (code, s390_r13, 0);
-                       s390_j    (code, 4);
-                       s390_word (code, ins->inst_imm);
-                       s390_sl   (code, ins->dreg, 0, s390_r13, 4);
+               case OP_SBB_IMM: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr    (code, ins->dreg, ins->sreg1);
+                       }
+                       if (s390_is_uimm16 (-ins->inst_imm)) {
+                               s390_lhi   (code, s390_r0, ins->inst_imm);
+                               s390_slbr  (code, ins->dreg, s390_r0);
+                       } else {
+                               s390_basr (code, s390_r13, 0);
+                               s390_j    (code, 4);
+                               s390_word (code, ins->inst_imm);
+                               s390_slb  (code, ins->dreg, 0, s390_r13, 4);
+                       }
+               }
+                       break;
+               case CEE_SUB_OVF: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_sr   (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+               }
+                       break;
+               case CEE_SUB_OVF_UN: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_slr  (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NC, "OverflowException");
+               }
+                       break;
+               case OP_SUB_OVF_CARRY: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_lhi  (code, s390_r0, 0);
+                       s390_lr   (code, s390_r1, s390_r0);
+                       s390_slbr (code, s390_r0, s390_r1);
+                       s390_sr   (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+                       s390_ar   (code, ins->dreg, s390_r0);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+               }
+                       break;
+               case OP_SUB_OVF_UN_CARRY: {
+                       if (ins->dreg != ins->sreg1) {
+                               s390_lr   (code, ins->dreg, ins->sreg1);
+                       }
+                       s390_slbr (code, ins->dreg, ins->sreg2);
+                       EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NC, "OverflowException");
+               }
                        break;
-               case CEE_AND:
+               case CEE_AND: {
                        if (ins->sreg1 == ins->dreg) {
                                s390_nr   (code, ins->dreg, ins->sreg2);
                        } 
@@ -3278,9 +3517,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_nr  (code, ins->dreg, ins->sreg2);
                                }
                        }
+               }
                        break;
-               case OP_AND_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_AND_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                s390_lhi  (code, s390_r0, ins->inst_imm);
                                if (ins->dreg != ins->sreg1) {
                                        s390_lr   (code, ins->dreg, ins->sreg1);
@@ -3295,21 +3535,24 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                }
                                s390_n    (code, ins->dreg, 0, s390_r13, 4);
                        }
+               }
                        break;
-               case CEE_DIV:
+               case CEE_DIV: {
                        s390_lr   (code, s390_r0, ins->sreg1);
                        s390_srda (code, s390_r0, 0, 32);
                        s390_dr   (code, s390_r0, ins->sreg2);
                        s390_lr   (code, ins->dreg, s390_r1);
+               }
                        break;
-               case CEE_DIV_UN:
+               case CEE_DIV_UN: {
                        s390_lr   (code, s390_r0, ins->sreg1);
                        s390_srdl (code, s390_r0, 0, 32);
                        s390_dlr  (code, s390_r0, ins->sreg2);
                        s390_lr   (code, ins->dreg, s390_r1);
+               }
                        break;
-               case OP_DIV_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_DIV_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                s390_lhi  (code, s390_r13, ins->inst_imm);
                                s390_lr   (code, s390_r0, ins->sreg1);
                        } else {
@@ -3320,10 +3563,11 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                        }
                        s390_srda (code, s390_r0, 0, 32);
-                       s390_dr   (code, s390_r0, ins->sreg2);
+                       s390_dr   (code, s390_r0, s390_r13);
                        s390_lr   (code, ins->dreg, s390_r1);
+               }
                        break;
-               case CEE_REM:
+               case CEE_REM: {
                        s390_lr   (code, s390_r0, ins->sreg1);
                        s390_srda (code, s390_r0, 0, 32);
                        s390_dr   (code, s390_r0, ins->sreg2);
@@ -3334,9 +3578,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        s390_srdl (code, s390_r0, 0, 32);
                        s390_dlr  (code, s390_r0, ins->sreg2);
                        s390_lr   (code, ins->dreg, s390_r0);
+               }
                        break;
-               case OP_REM_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_REM_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                s390_lhi  (code, s390_r13, ins->inst_imm);
                                s390_lr   (code, s390_r0, ins->sreg1);
                        } else {
@@ -3347,10 +3592,11 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                        }
                        s390_srda (code, s390_r0, 0, 32);
-                       s390_dr   (code, s390_r0, ins->sreg2);
+                       s390_dr   (code, s390_r0, s390_r13);
                        s390_lr   (code, ins->dreg, s390_r0);
+               }
                        break;
-               case CEE_OR:
+               case CEE_OR: {
                        if (ins->sreg1 == ins->dreg) {
                                s390_or   (code, ins->dreg, ins->sreg2);
                        } 
@@ -3363,24 +3609,27 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_or  (code, ins->dreg, ins->sreg2);
                                }
                        }
+               }
                        break;
-               case OP_OR_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_OR_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                s390_lhi  (code, s390_r0, ins->inst_imm);
                                if (ins->dreg != ins->sreg1) {
                                        s390_lr   (code, ins->dreg, ins->sreg1);
                                }
                                s390_or   (code, ins->dreg, s390_r0);
                        } else {
-                               s390_bras (code, s390_r13, 4);
+                               s390_basr (code, s390_r13, 0);
+                               s390_j    (code, 4);
                                s390_word (code, ins->inst_imm);
                                if (ins->dreg != ins->sreg1) {
                                        s390_lr   (code, ins->dreg, ins->sreg1);
                                }
-                               s390_o    (code, ins->dreg, 0, s390_r13, 0);
+                               s390_o    (code, ins->dreg, 0, s390_r13, 4);
                        }
+               }
                        break;
-               case CEE_XOR:
+               case CEE_XOR: {
                        if (ins->sreg1 == ins->dreg) {
                                s390_xr   (code, ins->dreg, ins->sreg2);
                        } 
@@ -3393,9 +3642,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_xr  (code, ins->dreg, ins->sreg2);
                                }
                        }
+               }
                        break;
-               case OP_XOR_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_XOR_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                s390_lhi  (code, s390_r0, ins->inst_imm);
                                if (ins->dreg != ins->sreg1) {
                                        s390_lr   (code, ins->dreg, ins->sreg1);
@@ -3410,54 +3660,63 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                }
                                s390_x    (code, ins->dreg, 0, s390_r13, 4);
                        }
+               }
                        break;
-               case CEE_SHL:
+               case CEE_SHL: {
                        if (ins->sreg1 != ins->dreg) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_sll  (code, ins->dreg, ins->sreg2, 0);
+               }
                        break;
-               case OP_SHL_IMM:
+               case OP_SHL_IMM: {
                        if (ins->sreg1 != ins->dreg) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_sll  (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
+               }
                        break;
-               case CEE_SHR:
+               case CEE_SHR: {
                        if (ins->sreg1 != ins->dreg) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_sra  (code, ins->dreg, ins->sreg2, 0);
+               }
                        break;
-               case OP_SHR_IMM:
+               case OP_SHR_IMM: {
                        if (ins->sreg1 != ins->dreg) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_sra  (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
+               }
                        break;
-               case OP_SHR_UN_IMM:
+               case OP_SHR_UN_IMM: {
                        if (ins->sreg1 != ins->dreg) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_srl  (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
+               }
                        break;
-               case CEE_SHR_UN:
+               case CEE_SHR_UN: {
                        if (ins->sreg1 != ins->dreg) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_srl  (code, ins->dreg, ins->sreg2, 0);
+               }
                        break;
-               case CEE_NOT:
+               case CEE_NOT: {
                        if (ins->sreg1 != ins->dreg) {
                                s390_lr   (code, ins->dreg, ins->sreg1);
                        }
                        s390_lhi (code, s390_r0, -1);
                        s390_xr  (code, ins->dreg, s390_r0);
+               }
                        break;
-               case CEE_NEG:
+               case CEE_NEG: {
                        s390_lcr (code, ins->dreg, ins->sreg1);
+               }
                        break;
-               case CEE_MUL:
+               case CEE_MUL: {
                        if (ins->sreg1 == ins->dreg) {
                                s390_msr  (code, ins->dreg, ins->sreg2);
                        } 
@@ -3470,9 +3729,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_msr (code, ins->dreg, ins->sreg2);
                                }
                        }
+               }
                        break;
-               case OP_MUL_IMM:
-                       if (s390_is_imm16 (ins->inst_imm)) {
+               case OP_MUL_IMM: {
+                       if (s390_is_uimm16 (ins->inst_imm)) {
                                s390_lhi  (code, s390_r13, ins->inst_imm);
                        } else {
                                s390_basr (code, s390_r13, 0);
@@ -3484,40 +3744,54 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                        }
                        s390_msr  (code, ins->dreg, s390_r13);
+               }
                        break;
-               case CEE_MUL_OVF:
-                       s390_lhi  (code, s390_r0, 0);
-                       s390_lr   (code, s390_r1, ins->sreg1);
-                       s390_mr   (code, s390_r0, ins->sreg2);
+               case CEE_MUL_OVF: {
+                       short int *o[2];
+                       s390_ltr  (code, s390_r1, ins->sreg1);
+                       s390_jz   (code, 0); CODEPTR(code, o[0]);
+                       s390_ltr  (code, s390_r0, ins->sreg2);
+                       s390_jnz  (code, 6);
+                       s390_lhi  (code, s390_r1, 0);
+                       s390_j    (code, 0); CODEPTR(code, o[1]);
+                       s390_xr   (code, s390_r0, s390_r1);
+                       s390_msr  (code, s390_r1, ins->sreg2);
+                       s390_xr   (code, s390_r0, s390_r1);
+                       s390_srl  (code, s390_r0, 0, 31);
                        s390_ltr  (code, s390_r0, s390_r0);
                        EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NZ, "OverflowException");
+                       PTRSLOT   (code, o[0]); 
+                       PTRSLOT   (code, o[1]);
                        s390_lr   (code, ins->dreg, s390_r1);
+               }
                        break;
-               case CEE_MUL_OVF_UN:
+               case CEE_MUL_OVF_UN: {
                        s390_lhi  (code, s390_r0, 0);
                        s390_lr   (code, s390_r1, ins->sreg1);
                        s390_mlr  (code, s390_r0, ins->sreg2);
                        s390_ltr  (code, s390_r0, s390_r0);
                        EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NZ, "OverflowException");
                        s390_lr   (code, ins->dreg, s390_r1);
+               }
                        break;
-               case OP_LMUL:
+               case OP_LMUL: {
                        s390_l    (code, s390_r0, 0, ins->sreg1, 4);
-                       s390_lr   (code, s390_r14, s390_r0);
                        s390_srda (code, s390_r0, 0, 32);
                        s390_m    (code, s390_r0, 0, ins->sreg2, 4);
-                       s390_srl  (code, s390_r14, 0, 31);
-                       s390_a    (code, s390_r14, 0, ins->sreg1, 0);
+                       s390_l    (code, s390_r0, 0, ins->sreg1, 4);
+                       s390_srl  (code, s390_r0, 0, 31);
+                       s390_a    (code, s390_r0, 0, ins->sreg1, 0);
                        s390_l    (code, s390_r13, 0, ins->sreg2, 0);
                        s390_srl  (code, s390_r13, 0, 31);
                        s390_ms   (code, s390_r13, 0, ins->sreg1, 4);
-                       s390_ar   (code, s390_r14, s390_r13);
-                       s390_st   (code, s390_r14, 0, ins->dreg, 0);
+                       s390_ar   (code, s390_r0, s390_r13);
+                       s390_st   (code, s390_r0, 0, ins->dreg, 0);
                        s390_st   (code, s390_r1, 0, ins->dreg, 4);
+               }
                        break;  
                case OP_ICONST:
-               case OP_SETREGIMM:
-                       if (s390_is_imm16(ins->inst_c0)) {
+               case OP_SETREGIMM: {
+                       if (s390_is_uimm16(ins->inst_c0)) {
                                s390_lhi  (code, ins->dreg, ins->inst_c0);
                        } else {
                                s390_basr (code, s390_r13, 0);
@@ -3525,22 +3799,25 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_word (code, ins->inst_c0);
                                s390_l    (code, ins->dreg, 0, s390_r13, 4);
                        }
+               }
                        break;
-               case OP_AOTCONST:
+               case OP_AOTCONST: {
                        s390_basr (code, s390_r13, 0);
                        s390_j    (code, 4);
                        mono_add_patch_info (cfg, code - cfg->native_code, 
                                (MonoJumpInfoType)ins->inst_i1, ins->inst_p0);
                        s390_word (code, 0);
                        s390_l    (code,ins->dreg, 0, s390_r13, 4);
+               }
                        break;
                case CEE_CONV_I4:
                case CEE_CONV_U4:
                case OP_MOVE:
-               case OP_SETREG:
+               case OP_SETREG: {
                        if (ins->dreg != ins->sreg1) {
                                s390_lr (code, ins->dreg, ins->sreg1);
                        }
+               }
                        break;
                case OP_SETLRET: {
                        int saved = ins->sreg1;
@@ -3555,53 +3832,120 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        break;
                }
                case OP_SETFREG:
-               case OP_FMOVE:
+               case OP_FMOVE: {
                        if (ins->dreg != ins->sreg1) {
                                s390_ldr   (code, ins->dreg, ins->sreg1);
                        }
+               }
                        break;
-               case OP_FCONV_TO_R4:
+               case OP_S390_SETF4RET: {
                        s390_ledbr (code, ins->dreg, ins->sreg1);
+               }
                        break;
-               case CEE_JMP:
-                       g_assert_not_reached ();
+               case OP_FCONV_TO_R4: {
+                       if ((ins->next) &&
+                           (ins->next->opcode != OP_STORER4_MEMBASE_REG))
+                               s390_ledbr (code, ins->dreg, ins->sreg1);
+               }
+                       break;
+               case CEE_JMP: {
+                       int fParm;
+                       if (cfg->method->save_lmf)
+                               restoreLMF(code, cfg->frame_reg, cfg->stack_usage);
+
+                       if (cfg->flags & MONO_CFG_HAS_TAIL) {
+                               s390_lm (code, s390_r2, s390_r5, STK_BASE, 
+                                        S390_PARM_SAVE_OFFSET);
+                               for (fParm = 0; fParm < 4; fParm++)
+                                       s390_ld (code, fParm, 0, STK_BASE,
+                                          S390_FLOAT_SAVE_OFFSET+fParm*sizeof(double));
+                       }
+
+                       code = backUpStackPtr(cfg, code);
+                       s390_l   (code, s390_r14, 0, STK_BASE, S390_RET_ADDR_OFFSET);
+                       mono_add_patch_info (cfg, code - cfg->native_code,
+                                            MONO_PATCH_INFO_METHOD_JUMP,
+                                            ins->inst_p0);
+                       s390_jcl (code, S390_CC_UN, 0);
+               }
                        break;
-               case OP_CHECK_THIS:
+               case OP_CHECK_THIS: {
                        /* ensure ins->sreg1 is not NULL */
                        s390_icm (code, s390_r0, 15, ins->sreg1, 0);
+               }
+                       break;
+               case OP_ARGLIST: {
+                       NOT_IMPLEMENTED("OP_ARGLIST");
+                       s390_basr (code, s390_r13, 0);
+                       s390_j    (code, 4);
+                       s390_word (code, cfg->sig_cookie);
+                       s390_mvc  (code, 4, ins->sreg1, 0, s390_r13, 4);
+               }
+                       break;
+               case OP_FCALL: {
+                       call = (MonoCallInst*)ins;
+                       if (ins->flags & MONO_INST_HAS_METHOD)
+                               mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_METHOD, 
+                                                    call->method);
+                       else
+                               mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_ABS, 
+                                                    call->fptr);
+                       s390_brasl (code, s390_r14, 0);
+                       if (call->signature->ret->type == MONO_TYPE_R4)
+                               s390_ldebr (code, s390_f0, s390_f0);
+               }
                        break;
-               case OP_FCALL:
                case OP_LCALL:
                case OP_VCALL:
                case OP_VOIDCALL:
-               case CEE_CALL:
+               case CEE_CALL: {
                        call = (MonoCallInst*)ins;
                        if (ins->flags & MONO_INST_HAS_METHOD)
                                mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_METHOD, call->method);
                        else
                                mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_ABS, call->fptr);
                        s390_brasl (code, s390_r14, 0);
+               }
+                       break;
+               case OP_FCALL_REG: {
+                       call = (MonoCallInst*)ins;
+                       s390_lr   (code, s390_r1, ins->sreg1);
+                       s390_basr (code, s390_r14, s390_r1);
+                       if (call->signature->ret->type == MONO_TYPE_R4)
+                               s390_ldebr (code, s390_f0, s390_f0);
+               }
                        break;
-               case OP_FCALL_REG:
                case OP_LCALL_REG:
                case OP_VCALL_REG:
                case OP_VOIDCALL_REG:
-               case OP_CALL_REG:
+               case OP_CALL_REG: {
                        s390_lr   (code, s390_r1, ins->sreg1);
                        s390_basr (code, s390_r14, s390_r1);
+               }
+                       break;
+               case OP_FCALL_MEMBASE: {
+                       call = (MonoCallInst*)ins;
+                       s390_l    (code, s390_r1, 0, ins->sreg1, ins->inst_offset);
+                       s390_basr (code, s390_r14, s390_r1);
+                       if (call->signature->ret->type == MONO_TYPE_R4)
+                               s390_ldebr (code, s390_f0, s390_f0);
+               }
                        break;
-               case OP_FCALL_MEMBASE:
                case OP_LCALL_MEMBASE:
                case OP_VCALL_MEMBASE:
                case OP_VOIDCALL_MEMBASE:
-               case OP_CALL_MEMBASE:
+               case OP_CALL_MEMBASE: {
                        s390_l    (code, s390_r1, 0, ins->sreg1, ins->inst_offset);
                        s390_basr (code, s390_r14, s390_r1);
+               }
                        break;
-               case OP_OUTARG:
+               case OP_OUTARG: 
                        g_assert_not_reached ();
                        break;
-               case OP_LOCALLOC:
+               case OP_LOCALLOC: {
+                       int alloca_skip = S390_MINIMAL_STACK_SIZE + cfg->param_area + 
+                                         S390_STACK_ALIGNMENT - 1;
+                       int area_offset = S390_ALIGN(alloca_skip, S390_STACK_ALIGNMENT);
                        s390_lr   (code, s390_r1, ins->sreg1);
                        s390_ahi  (code, s390_r1, 14);
                        s390_srl  (code, s390_r1, 0, 3);
@@ -3610,73 +3954,122 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        s390_lcr  (code, s390_r1, s390_r1);
                        s390_la   (code, STK_BASE, STK_BASE, s390_r1, 0);
                        s390_st   (code, s390_r13, 0, STK_BASE, 0);
-                       s390_la   (code, ins->dreg, 0, STK_BASE, S390_MINIMAL_STACK_SIZE+7);
+                       s390_la   (code, ins->dreg, 0, STK_BASE, area_offset);
                        s390_srl  (code, ins->dreg, 0, 3);
                        s390_sll  (code, ins->dreg, 0, 3);
+               }
                        break;
-               case CEE_RET:
+               case CEE_RET: {
                        s390_br  (code, s390_r14);
+               }
                        break;
                case CEE_THROW: {
                        s390_lr (code, s390_r2, ins->sreg1);
                        mono_add_patch_info (cfg, code-cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, 
                                             (gpointer)"mono_arch_throw_exception");
                        s390_brasl (code, s390_r14, 0);
+               }
                        break;
+               case OP_RETHROW: {
+                       s390_lr (code, s390_r2, ins->sreg1);
+                       mono_add_patch_info (cfg, code-cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, 
+                                            (gpointer)"mono_arch_rethrow_exception");
+                       s390_brasl (code, s390_r14, 0);
                }
-               case OP_START_HANDLER:
-                       s390_lr   (code, s390_r0, s390_r14);
-                       s390_st   (code, s390_r0, 0, ins->inst_left->inst_basereg, ins->inst_left->inst_offset);
                        break;
-               case OP_ENDFILTER:
+               case OP_START_HANDLER: {
+                       if (s390_is_uimm12 (ins->inst_left->inst_offset)) {
+                               s390_st   (code, s390_r14, 0, 
+                                          ins->inst_left->inst_basereg, 
+                                          ins->inst_left->inst_offset);
+                       } else {
+                               s390_basr (code, s390_r13, 0);
+                               s390_j    (code, 4);
+                               s390_word (code, ins->inst_left->inst_offset);
+                               s390_l    (code, s390_r13, 0, s390_r13, 4);
+                               s390_st   (code, s390_r14, s390_r13, 
+                                          ins->inst_left->inst_basereg, 0);
+                       }
+               }
+                       break;
+               case OP_ENDFILTER: {
                        if (ins->sreg1 != s390_r2)
                                s390_lr (code, s390_r2, ins->sreg1);
-                       s390_l   (code, STK_BASE, 0, STK_BASE, 0);
-                       s390_lm  (code, s390_r6, s390_r14, STK_BASE, S390_REG_SAVE_OFFSET);
+                       if (s390_is_uimm12 (ins->inst_left->inst_offset)) {
+                               s390_l  (code, s390_r14, 0, ins->inst_left->inst_basereg,
+                                        ins->inst_left->inst_offset);
+                       } else {
+                               s390_basr (code, s390_r13, 0);
+                               s390_j    (code, 4);
+                               s390_word (code, ins->inst_left->inst_offset);
+                               s390_l    (code, s390_r13, 0, s390_r13, 4);
+                               s390_l    (code, s390_r14, s390_r13, 
+                                          ins->inst_left->inst_basereg, 0);
+                       }
                        s390_br  (code, s390_r14);
+               }
                        break;
-               case CEE_ENDFINALLY:
-                       s390_l   (code, s390_r14, 0, ins->inst_left->inst_basereg, ins->inst_left->inst_offset);
+               case CEE_ENDFINALLY: {
+                       if (s390_is_uimm12 (ins->inst_left->inst_offset)) {
+                               s390_l  (code, s390_r14, 0, ins->inst_left->inst_basereg,
+                                        ins->inst_left->inst_offset);
+                       } else {
+                               s390_basr (code, s390_r13, 0);
+                               s390_j    (code, 4);
+                               s390_word (code, ins->inst_left->inst_offset);
+                               s390_l    (code, s390_r13, 0, s390_r13, 4);
+                               s390_l    (code, s390_r14, s390_r13, 
+                                          ins->inst_left->inst_basereg, 0);
+                       }
                        s390_br  (code, s390_r14);
+               }
                        break;
-               case OP_CALL_HANDLER: 
+               case OP_CALL_HANDLER: {
                        mono_add_patch_info (cfg, code-cfg->native_code, 
                                             MONO_PATCH_INFO_BB, ins->inst_target_bb);
                        s390_brasl (code, s390_r14, 0);
+               }
                        break;
-               case OP_LABEL:
+               case OP_LABEL: {
                        ins->inst_c0 = code - cfg->native_code;
+               }
                        break;
-               case CEE_BR:
+               case CEE_BR: 
                        EMIT_UNCOND_BRANCH(ins);
                        break;
-               case OP_BR_REG:
+               case OP_BR_REG: {
                        s390_br  (code, ins->sreg1);
+               }
                        break;
-               case OP_CEQ:
+               case OP_CEQ: {
                        s390_lhi (code, ins->dreg, 1);
                        s390_jz  (code, 4);
                        s390_lhi (code, ins->dreg, 0);
+               }
                        break;
-               case OP_CLT:
+               case OP_CLT: {
                        s390_lhi (code, ins->dreg, 1);
                        s390_jl  (code, 4);
                        s390_lhi (code, ins->dreg, 0);
+               }
                        break;
-               case OP_CLT_UN:
+               case OP_CLT_UN: {
                        s390_lhi (code, ins->dreg, 1);
                        s390_jlo (code, 4);
                        s390_lhi (code, ins->dreg, 0);
+               }
                        break;
-               case OP_CGT:
+               case OP_CGT: {
                        s390_lhi (code, ins->dreg, 1);
                        s390_jh  (code, 4);
                        s390_lhi (code, ins->dreg, 0);
+               }
                        break;
-               case OP_CGT_UN:
+               case OP_CGT_UN: {
                        s390_lhi (code, ins->dreg, 1);
                        s390_jho (code, 4);
                        s390_lhi (code, ins->dreg, 0);
+               }
                        break;
                case OP_COND_EXC_EQ:
                        EMIT_COND_SYSTEM_EXCEPTION (S390_CC_EQ, ins->inst_p1);
@@ -3736,7 +4129,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        break;
 
                /* floating point opcodes */
-               case OP_R8CONST:
+               case OP_R8CONST: {
                        if (*((float *) ins->inst_p0) == 0) {
                                s390_lzdr (code, ins->dreg);
                        } else {
@@ -3746,20 +4139,21 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l     (code, s390_r13, 0, s390_r13, 4);
                                s390_ld    (code, ins->dreg, 0, s390_r13, 0);
                        }
+               }
                        break;
-               case OP_R4CONST:
+               case OP_R4CONST: {
                        if (*((float *) ins->inst_p0) == 0) {
-                               s390_lzer (code, ins->dreg);
+                               s390_lzdr (code, ins->dreg);
                        } else {
                                s390_basr (code, s390_r13, 0);
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_p0);
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
-                               s390_le   (code, ins->dreg, 0, s390_r13, 0);
-                               s390_ldebr(code, ins->dreg, ins->dreg);
+                               s390_ldeb (code, ins->dreg, 0, s390_r13, 0);
                        }
+               }
                        break;
-               case OP_STORER8_MEMBASE_REG:
+               case OP_STORER8_MEMBASE_REG: {
                        if (s390_is_uimm12(ins->inst_offset)) {
                                s390_std  (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
                        } else {
@@ -3769,8 +4163,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                                s390_std  (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
-               case OP_LOADR8_MEMBASE:
+               case OP_LOADR8_MEMBASE: {
                        if (s390_is_uimm12(ins->inst_offset)) {
                                s390_ld   (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
                        } else {
@@ -3780,33 +4175,35 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
                                s390_ld   (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
                        }
+               }
                        break;
-               case OP_STORER4_MEMBASE_REG:
+               case OP_STORER4_MEMBASE_REG: {
                        if (s390_is_uimm12(ins->inst_offset)) {
-                               s390_ledbr(code, s390_f0, ins->sreg1);
-                               s390_ste  (code, s390_f0, 0, ins->inst_destbasereg, ins->inst_offset);
+                               s390_ledbr(code, s390_f15, ins->sreg1);
+                               s390_ste  (code, s390_f15, 0, ins->inst_destbasereg, ins->inst_offset);
                        } else {
                                s390_basr (code, s390_r13, 0);
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_offset);
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
-                               s390_ledbr(code, s390_f0, ins->sreg1);
-                               s390_ste  (code, s390_f0, s390_r13, ins->inst_destbasereg, 0);
+                               s390_ledbr(code, s390_f15, ins->sreg1);
+                               s390_ste  (code, s390_f15, s390_r13, ins->inst_destbasereg, 0);
                        }
+               }
                        break;
-               case OP_LOADR4_MEMBASE:
+               case OP_LOADR4_MEMBASE: {
                        if (s390_is_uimm12(ins->inst_offset)) {
-                               s390_le   (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
+                               s390_ldeb (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
                        } else {
                                s390_basr (code, s390_r13, 0);
                                s390_j    (code, 4);
                                s390_word (code, ins->inst_offset);
                                s390_l    (code, s390_r13, 0, s390_r13, 4);
-                               s390_le   (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
+                               s390_ldeb (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
                        }
-                       s390_ldebr (code, ins->dreg, ins->dreg);
+               }
                        break;
-               case CEE_CONV_R_UN: 
+               case CEE_CONV_R_UN: {
                        s390_cdfbr (code, ins->dreg, ins->sreg1);
                        s390_ltr   (code, ins->sreg1, ins->sreg1);
                        s390_jnl   (code, 12);
@@ -3815,12 +4212,15 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        s390_word  (code, 0x41f00000);
                        s390_word  (code, 0);
                        s390_adb   (code, ins->dreg, 0, s390_r13, 4);
+               }
                        break;
-               case CEE_CONV_R4: 
-                       s390_cefbr (code, ins->dreg, ins->sreg1);
+               case CEE_CONV_R4: {
+                       s390_cdfbr (code, ins->dreg, ins->sreg1);
+               }
                        break;
-               case CEE_CONV_R8:
+               case CEE_CONV_R8: {
                        s390_cdfbr (code, ins->dreg, ins->sreg1);
+               }
                        break;
                case OP_FCONV_TO_I1:
                        code = emit_float_to_int (cfg, code, ins->dreg, ins->sreg1, 1, TRUE);
@@ -3854,17 +4254,18 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_LCONV_TO_OVF_I: {
                        /* Valid ints: 0xffffffff:8000000 to 00000000:0x7f000000 */
                        short int *o[5];
-                       s390_ltr  (code, ins->sreg2, ins->sreg2);
-                       s390_jnl  (code, 0); CODEPTR(code, o[0]);
                        s390_ltr  (code, ins->sreg1, ins->sreg1);
+                       s390_jnl  (code, 0); CODEPTR(code, o[0]);
+                       s390_ltr  (code, ins->sreg2, ins->sreg2);
                        s390_jnl  (code, 0); CODEPTR(code, o[1]);
                        s390_lhi  (code, s390_r13, -1);
-                       s390_cr   (code, ins->sreg1, s390_r13);
+                       s390_cr   (code, ins->sreg2, s390_r13);
                        s390_jnz  (code, 0); CODEPTR(code, o[2]);
-                       if (ins->dreg != ins->sreg2)
-                               s390_lr   (code, ins->dreg, ins->sreg2);
+                       if (ins->dreg != ins->sreg1)
+                               s390_lr   (code, ins->dreg, ins->sreg1);
                        s390_j    (code, 0); CODEPTR(code, o[3]);
                        PTRSLOT(code, o[0]);
+                       s390_ltr  (code, ins->sreg2, ins->sreg2);
                        s390_jz   (code, 0); CODEPTR(code, o[4]);
                        PTRSLOT(code, o[1]);
                        PTRSLOT(code, o[2]);
@@ -3873,12 +4274,13 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        s390_brasl (code, s390_r14, 0);
                        PTRSLOT(code, o[3]);
                        PTRSLOT(code, o[4]);
-                       break;
                }
-               case OP_SQRT:
+                       break;
+               case OP_SQRT: {
                        s390_sqdbr (code, ins->dreg, ins->sreg1);
+               }
                        break;
-               case OP_FADD:
+               case OP_FADD: {
                        if (ins->dreg == ins->sreg1)
                                s390_adbr (code, ins->dreg, ins->sreg2);
                        else {
@@ -3889,16 +4291,18 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_adbr (code, ins->dreg, ins->sreg2);
                                }
                        }
+               }
                        break;
-               case OP_FSUB:
+               case OP_FSUB: {
                        if (ins->dreg == ins->sreg1)
                                s390_sdbr (code, ins->dreg, ins->sreg2);
                        else {
                                s390_ldr  (code, ins->dreg, ins->sreg1);
                                s390_sdbr (code, ins->dreg, ins->sreg2);
                        }
+               }
                        break;          
-               case OP_FMUL:
+               case OP_FMUL: {
                        if (ins->dreg == ins->sreg1)
                                s390_mdbr (code, ins->dreg, ins->sreg2);
                        else {
@@ -3909,56 +4313,66 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                        s390_mdbr (code, ins->dreg, ins->sreg2);
                                }
                        }
+               }
                        break;          
-               case OP_FDIV:
+               case OP_FDIV: {
                        if (ins->dreg == ins->sreg1)
                                s390_ddbr (code, ins->dreg, ins->sreg2);
                        else {
                                s390_ldr  (code, ins->dreg, ins->sreg1);
                                s390_ddbr (code, ins->dreg, ins->sreg2);
                        }
+               }
                        break;          
-               case OP_FNEG:
+               case OP_FNEG: {
                        s390_lcdbr (code, ins->dreg, ins->sreg1);
+               }
                        break;          
-               case OP_FREM:
+               case OP_FREM: {
                        if (ins->dreg != ins->sreg1) {
                                s390_ldr  (code, ins->dreg, ins->sreg1);
                        }
                        s390_didbr (code, ins->dreg, ins->sreg2, 5, s390_f15);
+               }
                        break;
-               case OP_FCOMPARE:
+               case OP_FCOMPARE: {
                        s390_cdbr (code, ins->sreg1, ins->sreg2);
+               }
                        break;
-               case OP_FCEQ:
+               case OP_FCEQ: {
                        s390_cdbr  (code, ins->sreg1, ins->sreg2);
                        s390_lhi   (code, ins->dreg, 1);
                        s390_je    (code, 4);
                        s390_lhi   (code, ins->dreg, 0);
+               }
                        break;
-               case OP_FCLT:
+               case OP_FCLT: {
                        s390_cdbr  (code, ins->sreg1, ins->sreg2);
                        s390_lhi   (code, ins->dreg, 1);
                        s390_jl    (code, 4);
                        s390_lhi   (code, ins->dreg, 0);
+               }
                        break;
-               case OP_FCLT_UN:
+               case OP_FCLT_UN: {
                        s390_cdbr  (code, ins->sreg1, ins->sreg2);
                        s390_lhi   (code, ins->dreg, 1);
                        s390_jlo   (code, 4);
                        s390_lhi   (code, ins->dreg, 0);
+               }
                        break;
-               case OP_FCGT:
+               case OP_FCGT: {
                        s390_cdbr  (code, ins->sreg1, ins->sreg2);
                        s390_lhi   (code, ins->dreg, 1);
                        s390_jh    (code, 4);
                        s390_lhi   (code, ins->dreg, 0);
+               }
                        break;
-               case OP_FCGT_UN:
+               case OP_FCGT_UN: {
                        s390_cdbr  (code, ins->sreg1, ins->sreg2);
                        s390_lhi   (code, ins->dreg, 1);
                        s390_jho   (code, 4);
                        s390_lhi   (code, ins->dreg, 0);
+               }
                        break;
                case OP_FBEQ:
                        EMIT_COND_BRANCH (ins, S390_CC_EQ|S390_CC_OV);
@@ -3992,15 +4406,49 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        break;
                case CEE_CKFINITE: {
                        short *o;
-                       s390_lhi  (code, s390_r13, 0xfc0);
+                       s390_lhi  (code, s390_r13, 0x7f);
                        s390_tcdb (code, ins->sreg1, 0, s390_r13, 0);
                        s390_jz   (code, 0); CODEPTR(code, o);
-                       mono_add_patch_info (cfg, code - cfg->native_code + 2
+                       mono_add_patch_info (cfg, code - cfg->native_code, 
                                             MONO_PATCH_INFO_EXC, "ArithmeticException");
                        s390_brasl (code, s390_r14,0);
                        PTRSLOT(code, o);
+               }
                        break;
+               case OP_S390_MOVE: {
+                       if (ins->unused > 0) {
+                               if (ins->unused <= 256) {
+                                       s390_mvc  (code, ins->unused, ins->dreg, 
+                                                  ins->inst_offset, ins->sreg1, ins->inst_imm);
+                               } else {
+                                       s390_lr   (code, s390_r0, ins->dreg);
+                                       if (s390_is_uimm16 (ins->inst_offset)) {
+                                               s390_ahi  (code, s390_r0, ins->inst_offset);
+                                       } else {
+                                               s390_basr (code, s390_r13, 0);
+                                               s390_j    (code, 4);
+                                               s390_word (code, ins->inst_offset);
+                                               s390_a    (code, s390_r0, 0, s390_r13, 4);
+                                       }
+                                       s390_lr   (code, s390_r14, s390_r12);
+                                       s390_lr   (code, s390_r12, ins->sreg1);
+                                       if (s390_is_uimm16 (ins->inst_imm)) {
+                                               s390_ahi  (code, s390_r12, ins->inst_imm);
+                                       } else {
+                                               s390_basr (code, s390_r13, 0);
+                                               s390_j    (code, 4);
+                                                       s390_word (code, ins->inst_imm);
+                                               s390_a    (code, s390_r12, 0, s390_r13, 4);
+                                       }
+                                       s390_lr   (code, s390_r1, ins->sreg1);
+                                       s390_lr   (code, s390_r13, s390_r1);
+                                       s390_mvcle(code, s390_r0, s390_r12, 0, 0);
+                                       s390_jo   (code, -2);
+                                       s390_lr   (code, s390_r12, s390_r14);
+                               }
+                       }
                }
+                       break;
                default:
                        g_warning ("unknown opcode %s in %s()\n", mono_inst_name (ins->opcode), __FUNCTION__);
                        g_assert_not_reached ();
@@ -4092,9 +4540,26 @@ mono_arch_patch_code (MonoMethod *method, MonoDomain *domain, guint8 *code, Mono
                        ip    += 2;     /* Skip over op-code */
                        break;
                }
-               case MONO_PATCH_INFO_METHOD_JUMP:
-                       g_assert_not_reached ();
+               case MONO_PATCH_INFO_METHOD_JUMP: {
+                       GSList *list;
+
+                       /*------------------------------------------------------*/
+                       /* get the trampoline to the method from the domain     */
+                       /*------------------------------------------------------*/
+                       target = mono_create_jump_trampoline (domain, 
+                                                     patch_info->data.method, 
+                                                     TRUE);
+                       target = S390_RELATIVE(target, ip);
+                       if (!domain->jump_target_hash)
+                               domain->jump_target_hash = g_hash_table_new (NULL, NULL);
+                       list = g_hash_table_lookup (domain->jump_target_hash, 
+                                                   patch_info->data.method);
+                       list = g_slist_prepend (list, ip);
+                       g_hash_table_insert (domain->jump_target_hash, 
+                                            patch_info->data.method, list);
+                       ip  +=2;
                        break;
+               }
                case MONO_PATCH_INFO_METHOD:
                        if (patch_info->data.method == method) {
                                target = S390_RELATIVE(code, ip);
@@ -4251,42 +4716,37 @@ mono_arch_emit_prolog (MonoCompile *cfg)
        MonoBasicBlock *bb;
        MonoMethodSignature *sig;
        MonoInst *inst;
-       int alloc_size, pos, max_offset, i, lmfOffset;
+       int alloc_size, pos, max_offset, i;
        guint8 *code;
        CallInfo *cinfo;
        size_data sz;
        int tracing = 0;
+       int lmfOffset;                                                          \
 
        if (mono_jit_trace_calls != NULL && mono_trace_eval (method))
                tracing = 1;
 
-       cfg->code_size   = 256;
+       cfg->code_size   = 512;
        cfg->native_code = code = g_malloc (cfg->code_size);
 
-       s390_stm  (code, s390_r6, s390_r14, STK_BASE, S390_REG_SAVE_OFFSET);
+       if (cfg->flags & MONO_CFG_HAS_TAIL) {
+               s390_stm (code, s390_r2, s390_r14, STK_BASE, S390_PARM_SAVE_OFFSET);
+               for (pos = 0; pos < 4; pos++)
+                       s390_std (code, pos, 0, STK_BASE, 
+                                 S390_FLOAT_SAVE_OFFSET+pos*sizeof(double));
+       } else { 
+               s390_stm  (code, s390_r6, s390_r14, STK_BASE, S390_REG_SAVE_OFFSET);
+        }
 
        if (cfg->flags & MONO_CFG_HAS_ALLOCA) {
                cfg->used_int_regs |= 1 << 11;
        }
 
        alloc_size = cfg->stack_offset;
-//     if (tracing)
-//             alloc_size += S390_TRACE_STACK_SIZE;
-//     pos = 0;
-       /* reserve room to save return value */
-//     if (tracing)
-//             pos += 8;
-
-//     alloc_size += pos;
-
-//     if (method->save_lmf) 
-//             alloc_size += sizeof(MonoLMF);
-
-//     alloc_size = S390_ALIGN(alloc_size, S390_STACK_ALIGNMENT);
 
        cfg->stack_usage = alloc_size;
        s390_lr   (code, s390_r11, STK_BASE);
-       if (s390_is_imm16 (-alloc_size)) {
+       if (s390_is_uimm16 (alloc_size)) {
                s390_ahi  (code, STK_BASE, -alloc_size);
        } else { 
                int stackSize = alloc_size;
@@ -4298,7 +4758,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
        }
        s390_st   (code, s390_r11, 0, STK_BASE, 0);
 
-       if (cfg->flags & MONO_CFG_HAS_ALLOCA)
+       if (cfg->frame_reg != STK_BASE)
                s390_lr (code, s390_r11, STK_BASE);
 
         /* compute max_offset in order to use short forward jumps
@@ -4340,10 +4800,12 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                        if (ainfo->regtype == RegTypeGeneral)
                                s390_lr (code, inst->dreg, ainfo->reg);
                        else if (ainfo->regtype == RegTypeFP) {
-                               if (ainfo->size == 4) {
-                                       s390_ledbr (code, inst->dreg, ainfo->reg);
-                               } else {
-                                       s390_ldr   (code, inst->dreg, ainfo->reg);
+                               if (inst->dreg != ainfo->reg) {
+                                       if (ainfo->size == 4) {
+                                               s390_ledbr (code, inst->dreg, ainfo->reg);
+                                       } else {
+                                               s390_ldr   (code, inst->dreg, ainfo->reg);
+                                       }
                                }
                        }
                        else if (ainfo->regtype == RegTypeBase) {
@@ -4415,8 +4877,20 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                                                break;
                                }
                        } else if (ainfo->regtype == RegTypeStructByAddr) {
-                               code = emit_memcpy (code, ainfo->vtsize, 
-                                                   inst->inst_basereg, inst->inst_offset, ainfo->reg, 0);
+                               if (ainfo->reg == STK_BASE) {
+                                       s390_lr  (code, s390_r13, ainfo->reg);
+                                       s390_ahi (code, s390_r13, alloc_size);
+                                       s390_l   (code, s390_r13, 0, s390_r13, 
+                                                 ainfo->offparm + S390_MINIMAL_STACK_SIZE);
+                                       code = emit_memcpy (code, abs(ainfo->vtsize), 
+                                                           inst->inst_basereg, 
+                                                           inst->inst_offset, s390_r13, 0);
+                               } else {
+                                       code = emit_memcpy (code, abs(ainfo->vtsize), 
+                                                           inst->inst_basereg, 
+                                                           inst->inst_offset, 
+                                                           ainfo->reg, 0);
+                               }
                        } else
                                g_assert_not_reached ();
                }
@@ -4443,49 +4917,61 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                /*---------------------------------------------------------------*/
                /* we build the MonoLMF structure on the stack - see mini-s390.h */
                /*---------------------------------------------------------------*/
-               lmfOffset = alloc_size - sizeof(MonoLMF);
-
-               s390_lr    (code, s390_r13, cfg->frame_reg);
-               s390_ahi   (code, s390_r13, lmfOffset);
-
-               /*---------------------------------------------------------------*/
-               /* Set lmf.lmf_addr = jit_tls->lmf                               */
-               /*---------------------------------------------------------------*/
-               s390_st    (code, s390_r2, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, lmf_addr));
-
-               /*---------------------------------------------------------------*/
-               /* Get current lmf                                               */
-               /*---------------------------------------------------------------*/
-               s390_l     (code, s390_r0, 0, s390_r2, 0);
-
-               /*---------------------------------------------------------------*/
-               /* Set our lmf as the current lmf                                */
-               /*---------------------------------------------------------------*/
-               s390_st    (code, s390_r13, 0, s390_r2, 0);
-
-               /*---------------------------------------------------------------*/
-               /* Have our lmf.previous_lmf point to the last lmf               */
-               /*---------------------------------------------------------------*/
-               s390_st    (code, s390_r0, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, previous_lmf));
-
-               /*---------------------------------------------------------------*/
-               /* save method info                                              */
-               /*---------------------------------------------------------------*/
-               s390_basr  (code, s390_r1, 0);
-               s390_j     (code, 4);
-               s390_word  (code, method);
-               s390_l     (code, s390_r1, 0, s390_r1, 4);
-               s390_st    (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, method));
-
-               /*---------------------------------------------------------------*/
-               /* save the current IP                                           */
-               /*---------------------------------------------------------------*/
+               lmfOffset = alloc_size - sizeof(MonoLMF);       
+                                                                                       
+               s390_lr    (code, s390_r13, cfg->frame_reg);            
+               s390_ahi   (code, s390_r13, lmfOffset);                                 
+                                                                                       
+               /*---------------------------------------------------------------*/     
+               /* Set lmf.lmf_addr = jit_tls->lmf                               */     
+               /*---------------------------------------------------------------*/     
+               s390_st    (code, s390_r2, 0, s390_r13,                                 
+                           G_STRUCT_OFFSET(MonoLMF, lmf_addr));                        
+                                                                                       
+               /*---------------------------------------------------------------*/     
+               /* Get current lmf                                               */     
+               /*---------------------------------------------------------------*/     
+               s390_l     (code, s390_r0, 0, s390_r2, 0);                              
+                                                                                       
+               /*---------------------------------------------------------------*/     
+               /* Set our lmf as the current lmf                                */     
+               /*---------------------------------------------------------------*/     
+               s390_st    (code, s390_r13, 0, s390_r2, 0);                             
+                                                                                       
+               /*---------------------------------------------------------------*/     
+               /* Have our lmf.previous_lmf point to the last lmf               */     
+               /*---------------------------------------------------------------*/     
+               s390_st    (code, s390_r0, 0, s390_r13,                                 
+                           G_STRUCT_OFFSET(MonoLMF, previous_lmf));                    
+                                                                                       
+               /*---------------------------------------------------------------*/     
+               /* save method info                                              */     
+               /*---------------------------------------------------------------*/     
+               s390_basr  (code, s390_r1, 0);                                          
+               s390_j     (code, 4);                                                   
+               s390_word  (code, method);                                              
+               s390_l     (code, s390_r1, 0, s390_r1, 4);                      
+               s390_st    (code, s390_r1, 0, s390_r13,                                 
+                           G_STRUCT_OFFSET(MonoLMF, method));                          
+                                                                               
+               /*---------------------------------------------------------------*/     
+               /* save the current IP                                           */     
+               /*---------------------------------------------------------------*/     
                s390_lr    (code, s390_r1, cfg->frame_reg);
-               s390_ahi   (code, s390_r1, alloc_size);
-               s390_st    (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, ebp));
-               s390_l     (code, s390_r1, 0, s390_r1, S390_RET_ADDR_OFFSET);
-               s390_la    (code, s390_r1, 0, s390_r1, 0);
-               s390_st    (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, eip));
+               s390_st    (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, ebp)); 
+               s390_l     (code, s390_r1, 0, s390_r1, S390_RET_ADDR_OFFSET);           
+               s390_la    (code, s390_r1, 0, s390_r1, 0);                              
+               s390_st    (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, eip)); 
+                                                                                       
+               /*---------------------------------------------------------------*/     
+               /* Save general and floating point registers                     */     
+               /*---------------------------------------------------------------*/     
+               s390_stm   (code, s390_r2, s390_r12, s390_r13,                          
+                           G_STRUCT_OFFSET(MonoLMF, gregs[2]));                        
+               for (i = 0; i < 16; i++) {                                              
+                       s390_std  (code, i, 0, s390_r13,                                
+                                  G_STRUCT_OFFSET(MonoLMF, fregs[i]));                 
+               }                                                                       
 
                /*---------------------------------------------------------------*/
                /* Restore the parameter registers now that we've set up the lmf */
@@ -4520,9 +5006,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
 {
        MonoJumpInfo *patch_info;
        MonoMethod *method = cfg->method;
-       MonoMethodSignature *sig = method->signature;
-       MonoInst *inst;
-       int i, lmfOffset, tracing = 0;
+       int tracing = 0;
        guint8 *code;
 
        code = cfg->native_code + cfg->code_len;
@@ -4532,37 +5016,14 @@ mono_arch_emit_epilog (MonoCompile *cfg)
                tracing = 1;
        }
        
-       if (method->save_lmf) {
-               s390_lr  (code, s390_r13, cfg->frame_reg);
-
-               lmfOffset = cfg->stack_usage -  sizeof(MonoLMF);
-
-               /*-------------------------------------------------*/
-               /* r13 = my lmf                                    */
-               /*-------------------------------------------------*/
-               s390_ahi (code, s390_r13, lmfOffset);
-
-               /*-------------------------------------------------*/
-               /* r6 = &jit_tls->lmf                              */
-               /*-------------------------------------------------*/
-               s390_l   (code, s390_r6, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, lmf_addr));
-
-               /*-------------------------------------------------*/
-               /* r0 = lmf.previous_lmf                           */
-               /*-------------------------------------------------*/
-               s390_l   (code, s390_r0, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, previous_lmf));
-
-               /*-------------------------------------------------*/
-               /* jit_tls->lmf = previous_lmf                     */
-               /*-------------------------------------------------*/
-               s390_l   (code, s390_r13, 0, s390_r6, 0);
-               s390_st  (code, s390_r0, 0, s390_r6, 0);
-       }
+       if (method->save_lmf) 
+               restoreLMF(code, cfg->frame_reg, cfg->stack_usage);
 
-       if (cfg->frame_reg != STK_BASE)
-               s390_lr  (code, STK_BASE, cfg->frame_reg);
+       if (cfg->flags & MONO_CFG_HAS_ALLOCA) 
+               s390_l   (code, STK_BASE, 0, STK_BASE, 0);
+       else
+               code = backUpStackPtr(cfg, code);
 
-       s390_ahi (code, STK_BASE, cfg->stack_usage);
        s390_lm  (code, s390_r6, s390_r14, STK_BASE, S390_REG_SAVE_OFFSET);
        s390_br  (code, s390_r14);
 
@@ -4624,6 +5085,50 @@ mono_arch_emit_epilog (MonoCompile *cfg)
 void
 mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
 {
+#ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
+       pthread_t       self = pthread_self();
+       pthread_attr_t  attr;
+       void            *stAddr = NULL;
+       size_t          stSize  = 0;
+       struct sigaltstack sa;
+#endif
+
+       if (!tls_offset_inited) {
+               tls_offset_inited = TRUE;
+
+//             lmf_tls_offset = read_tls_offset_from_method (mono_get_lmf_addr);
+//             appdomain_tls_offset = read_tls_offset_from_method (mono_domain_get);
+//             thread_tls_offset = read_tls_offset_from_method (mono_thread_current);
+       }               
+
+#ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
+
+       /*----------------------------------------------------------*/
+       /* Determine stack boundaries                               */
+       /*----------------------------------------------------------*/
+       if (!mono_running_on_valgrind ()) {
+#ifdef HAVE_PTHREAD_GETATTR_NP
+               pthread_getattr_np( self, &attr );
+#elif HAVE_PTHREAD_ATTR_GET_NP
+               pthread_attr_get_np( self, &attr );
+#endif
+               pthread_attr_getstack( &attr, &stAddr, &stSize );
+       }
+
+
+       /*----------------------------------------------------------*/
+       /* Setup an alternate signal stack                          */
+       /*----------------------------------------------------------*/
+       tls->stack_size        = stSize;
+       tls->signal_stack      = g_malloc (SIGNAL_STACK_SIZE);
+       tls->signal_stack_size = SIGNAL_STACK_SIZE;
+
+       sa.ss_sp    = tls->signal_stack;
+       sa.ss_size  = SIGNAL_STACK_SIZE;
+       sa.ss_flags = SS_ONSTACK;
+       sigaltstack (&sa, NULL);
+#endif
+
 }
 
 /*========================= End of Function ========================*/
@@ -4639,6 +5144,18 @@ mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
 void
 mono_arch_free_jit_tls_data (MonoJitTlsData *tls)
 {
+#ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
+       struct sigaltstack sa;
+
+       sa.ss_sp    = tls->signal_stack;
+       sa.ss_size  = SIGNAL_STACK_SIZE;
+       sa.ss_flags = SS_DISABLE;
+       sigaltstack (&sa, NULL);
+
+       if (tls->signal_stack)
+               g_free (tls->signal_stack);
+#endif
+
 }
 
 /*========================= End of Function ========================*/
@@ -4721,11 +5238,26 @@ mono_arch_print_tree (MonoInst *tree, int arity)
        switch (tree->opcode) {
                case OP_S390_LOADARG:
                case OP_S390_ARGPTR:
-               case OP_S390_STKARG:
                        printf ("[0x%x(%s)]", tree->inst_offset, 
                                mono_arch_regname (tree->inst_basereg));
                        done = 1;
                        break;
+               case OP_S390_STKARG:
+                       printf ("[0x%x(previous_frame)]", 
+                               tree->inst_offset); 
+                       done = 1;
+                       break;
+               case OP_S390_MOVE:
+                       printf ("[0x%x(%d,%s),0x%x(%s)]",
+                               tree->inst_offset, tree->unused,
+                               tree->dreg, tree->inst_imm, 
+                               tree->sreg1);
+                       done = 1;
+                       break;
+               case OP_S390_SETF4RET:
+                       printf ("[f%d,f%d]", 
+                               mono_arch_regname (tree->dreg),
+                               mono_arch_regname (tree->sreg1));
                default:
                        done = 0;
        }
@@ -4751,7 +5283,41 @@ guint32
 mono_arch_regalloc_cost (MonoCompile *cfg, MonoMethodVar *vmv)
 {
        /* FIXME: */
-       return 3;
+       return 2;
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name                - mono_arch_get_domain_intrinsic                    */
+/*                                                                  */
+/* Function    -                                                   */
+/*                                                                 */
+/* Returns     -                                                   */
+/*                                                                  */
+/*------------------------------------------------------------------*/
+
+MonoInst* mono_arch_get_domain_intrinsic (MonoCompile* cfg)
+{
+       return NULL;
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name                - mono_arch_get_thread_intrinsic                    */
+/*                                                                  */
+/* Function    -                                                   */
+/*                                                                 */
+/* Returns     -                                                   */
+/*                                                                  */
+/*------------------------------------------------------------------*/
+
+MonoInst* mono_arch_get_thread_intrinsic (MonoCompile* cfg)
+{
+       return NULL;
 }
 
 /*========================= End of Function ========================*/