Don't run test-318 with gmcs.
[mono.git] / mono / mini / inssel-s390.brg
index 631fdea7f33f2adee877b8e7133fa121475c4256..4a1daf4ad5b4188a4aa01f564e8cb3131748083e 100644 (file)
@@ -30,17 +30,72 @@ stmt: OP_ENDFILTER (reg) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+lreg: OP_LADD_OVF (lreg, lreg) "0" {
+       /* ADC sets the condition code */
+       MONO_EMIT_NEW_BIALU (s, OP_ADDCC, state->reg1, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_BIALU (s, OP_ADD_OVF_CARRY, state->reg2, state->left->reg2, state->right->reg2);
+}
+
+lreg: OP_LADD_OVF_UN (lreg, lreg) "0" {
+       /* ADC sets the condition code */
+       MONO_EMIT_NEW_BIALU (s, OP_ADDCC, state->reg1, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_BIALU (s, OP_ADD_OVF_UN_CARRY, state->reg2, state->left->reg2, state->right->reg2);
+}
+
+lreg: OP_LSUB_OVF (lreg, lreg) "0" {
+       /* SBB sets the condition code */
+       MONO_EMIT_NEW_BIALU (s, OP_SUBCC, state->reg1, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_BIALU (s, OP_SUB_OVF_CARRY, state->reg2, state->left->reg2, state->right->reg2);
+}
+
+lreg: OP_LSUB_OVF_UN (lreg, lreg) "0" {
+       /* SBB sets the condition code */
+       MONO_EMIT_NEW_BIALU (s, OP_SUBCC, state->reg1, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_BIALU (s, OP_SUB_OVF_UN_CARRY, state->reg2, state->left->reg2, state->right->reg2);
+}
+
+reg: CEE_ADD_OVF (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
+}
+
+reg: CEE_ADD_OVF_UN (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
+}
+
+reg: CEE_SUB_OVF (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
+}
+
+reg: CEE_SUB_OVF_UN (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
+}
+
 stmt: CEE_STIND_I8 (OP_REGVAR, lreg) {
+       /*------------------------------------------------------*/
        /* this should only happen for methods returning a long */
+       /* S/390 ABI uses r2/r3 for returning 64-bit integers   */
+       /*------------------------------------------------------*/
        MONO_EMIT_NEW_UNALU (s, OP_MOVE, s390_r2, state->right->reg1);
        MONO_EMIT_NEW_UNALU (s, OP_MOVE, s390_r3, state->right->reg2);
 }
 
 freg: OP_LCONV_TO_R8 (lreg) {
+       tree->dreg = state->reg1;
+       tree->sreg1 = state->left->reg1;
+       tree->sreg2 = state->left->reg2;
        mono_bblock_add_inst (s->cbb, tree);
 }
 
 freg: OP_LCONV_TO_R4 (lreg) {
+       tree->dreg = state->reg1;
+       tree->sreg1 = state->left->reg1;
+       tree->sreg2 = state->left->reg2;
+       mono_bblock_add_inst (s->cbb, tree);
+}
+
+freg: CEE_CONV_R_UN (reg) {
+       tree->dreg = state->reg1;
+       tree->sreg1 = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
 }
 
@@ -48,6 +103,23 @@ freg: CEE_CONV_R_UN (reg) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+stmt: OP_MEMCPY (reg, reg) "0" {
+       int size = tree->unused;
+       if (size > 0) 
+               MONO_EMIT_NEW_MOVE (s, state->left->reg1, 0, 
+                                   state->right->reg1, 0, size);
+}
+
+stmt: OP_MEMCPY (base, base) "0" {
+       int size = tree->unused;
+       if (size > 0)  
+               MONO_EMIT_NEW_MOVE (s, state->left->tree->sreg1, 
+                                   state->left->tree->inst_offset, 
+                                   state->right->tree->sreg1,
+                                   state->right->tree->inst_offset,
+                                   size);
+}
+
 reg: OP_LOCALLOC (OP_ICONST) {
        /* microcoded in mini-s390.c */
        tree->sreg1 = mono_regstate_next_int (s->rs);
@@ -77,9 +149,15 @@ stmt: OP_SETRET (lreg) {
 }
 
 stmt: OP_SETRET (freg) {
-       tree->opcode = OP_FMOVE;
-       tree->sreg1 = state->left->reg1;
-       tree->dreg = s390_f0;
+       if (s->method->signature->ret->type == MONO_TYPE_R4) {
+               tree->opcode = OP_S390_SETF4RET;
+               tree->sreg1  = state->left->reg1;
+               tree->dreg   = s390_f0;
+       } else {
+               tree->opcode = OP_FMOVE;
+               tree->sreg1  = state->left->reg1;
+               tree->dreg   = s390_f0;
+       }
        mono_bblock_add_inst (s->cbb, tree);
 }
 
@@ -90,9 +168,18 @@ stmt: OP_SETRET (OP_ICONST) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+lreg: OP_LSUB_OVF_UN (lreg, lreg) "0" {
+       /*----------------------------------------------------------------------*/
+       /* SBB sets the condition code - CC 0 or 1 indicates Borrow == Overflow */
+       /*----------------------------------------------------------------------*/
+       MONO_EMIT_NEW_BIALU (s, OP_SUBCC, state->reg1, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_BIALU (s, OP_SBB, state->reg2, state->left->reg2, state->right->reg2);
+       MONO_EMIT_NEW_COND_EXC (s, NC, "OverflowException");
+}
+
 stmt: OP_OUTARG (reg) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, s->frame_reg, tree->inst_imm, state->left->reg1);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->reg1);
                return;
        }
        tree->opcode = OP_SETREG;
@@ -103,7 +190,7 @@ stmt: OP_OUTARG (reg) {
 
 stmt: OP_OUTARG (OP_REGVAR) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, s->frame_reg, tree->inst_imm, state->left->tree->dreg);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->tree->dreg);
                return;
        }
        tree->opcode = OP_SETREG;
@@ -114,8 +201,8 @@ stmt: OP_OUTARG (OP_REGVAR) {
 
 stmt: OP_OUTARG (lreg) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, s->frame_reg, tree->inst_imm, state->left->reg2);
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, s->frame_reg, tree->inst_imm + 4, state->left->reg1);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->reg2);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm + 4, state->left->reg1);
                return;
        }
        MONO_EMIT_NEW_UNALU (s, OP_SETREG, tree->unused, state->left->reg2);
@@ -127,7 +214,7 @@ stmt: OP_OUTARG (lreg) {
 
 stmt: OP_OUTARG (OP_ICONST) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE_IMM (s, OP_STORE_MEMBASE_IMM, s->frame_reg, tree->inst_imm, state->left->tree->inst_c0);
+               MONO_EMIT_NEW_STORE_MEMBASE_IMM (s, OP_STORE_MEMBASE_IMM, STK_BASE, tree->inst_imm, state->left->tree->inst_c0);
                return;
        }
        tree->opcode = OP_SETREGIMM;
@@ -138,7 +225,7 @@ stmt: OP_OUTARG (OP_ICONST) {
 
 stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, s->frame_reg, tree->inst_imm, state->left->left->tree->dreg);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->left->tree->dreg);
                return;
        }
        tree->opcode = OP_SETREG;
@@ -147,9 +234,31 @@ stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+stmt: OP_OUTARG (OP_LDADDR (OP_S390_LOADARG)) {
+       if (tree->inst_imm) {
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->left->tree->dreg);
+               return;
+       }
+       MONO_EMIT_BIALU_IMM (s, tree, OP_ADD_IMM, tree->unused,
+                            state->left->left->tree->sreg1,
+                            state->left->left->tree->inst_offset);
+}
+
 stmt: OP_OUTARG (freg) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER8_MEMBASE_REG, s->frame_reg, tree->inst_imm, state->left->reg1);
+               /*----------------------------------------------*/
+               /* The length stored in unused tells us whether */
+               /* we need to store a float or a double         */
+               /*----------------------------------------------*/
+               if ((tree->unused & 0xff00) == 0x0400) {
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER4_MEMBASE_REG, 
+                                                    STK_BASE, tree->inst_imm, 
+                                                    state->left->reg1);
+               } else {
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER8_MEMBASE_REG, 
+                                                    STK_BASE, tree->inst_imm, 
+                                                    state->left->reg1);
+               }
                return;
        }
        tree->opcode = OP_SETFREG;
@@ -160,7 +269,7 @@ stmt: OP_OUTARG (freg) {
 
 stmt: OP_OUTARG_R4 (freg) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER4_MEMBASE_REG, s->frame_reg, tree->inst_imm, state->left->reg1);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER4_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->reg1);
                return;
        }
        tree->opcode = OP_SETFREG;
@@ -171,7 +280,7 @@ stmt: OP_OUTARG_R4 (freg) {
 
 stmt: OP_OUTARG_R8 (freg) {
        if (tree->inst_imm) {
-               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER8_MEMBASE_REG, s->frame_reg, tree->inst_imm, state->left->reg1);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER8_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->reg1);
                return;
        }
        tree->opcode = OP_SETFREG;
@@ -182,42 +291,143 @@ stmt: OP_OUTARG_R8 (freg) {
 
 stmt: OP_OUTARG_VT (CEE_LDOBJ (base)) {
        MonoInst *vt  = state->left->left->tree;
-       int start_reg = tree->sreg2;
+       int start_reg = tree->sreg1;
        int size      = tree->unused;
-       int nregs     = size / 4;
        int soffset   = vt->inst_offset;
-       int i, tmpr;
+       int tmpr;
+       
+//printf("OP_OUTARG_VT(CEE_LDOBJ(base))\n");
        if (size < 0) { 
                size = -size;
-printf("OP_OUTARG_VT (CEE_LDOBJ (base)) src: %d\n",vt->inst_basereg);
-               mini_emit_memcpy (s, s->frame_reg, tree->inst_imm,
-                                 vt->inst_basereg, soffset, size, 0);
                if (start_reg != STK_BASE) {
+                       MONO_EMIT_NEW_MOVE(s, STK_BASE, tree->sreg2,
+                                          vt->inst_basereg, soffset, size);
                        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, start_reg, 
-                                                s->frame_reg, tree->sreg1);
+                                                STK_BASE, tree->sreg2);
+               } else { 
+                       MONO_EMIT_NEW_MOVE(s, STK_BASE, tree->sreg2+sizeof(gpointer),
+                                          vt->inst_basereg, soffset, size);
+                       tmpr = mono_regstate_next_int (s->rs);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, STK_BASE, 
+                                                tree->sreg2+sizeof(gpointer));
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
+                                                    STK_BASE, tree->sreg2, tmpr);
                }
        } else {
                if (start_reg != STK_BASE) {
-                       for (i = 0; i < nregs; ++i) {
-                               tmpr = mono_regstate_next_int (s->rs);
-                               MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, vt->inst_basereg, 
-                                                           soffset);
-                               MONO_EMIT_NEW_UNALU (s, OP_SETREG, start_reg + i, tmpr);
-                               soffset += sizeof (gpointer);
-                       }
+                       MONO_OUTPUT_VTR (s, size, start_reg, vt->inst_basereg, soffset);
                } else {
-printf("OP_OUTARG_VT (CEELDOBJ (base)) src: %d\n",vt->inst_basereg);
-                       mini_emit_memcpy (s, s->frame_reg, tree->inst_imm, 
-                                         vt->inst_basereg, soffset, size, 0);
+                       MONO_OUTPUT_VTS (s, size, STK_BASE, tree->inst_imm,
+                                        vt->inst_basereg, soffset);
                }       
        }
 }
 
+stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_ARGPTR)) {
+       MonoInst *vt  = state->left->left->tree;
+       int start_reg = tree->sreg1;
+       int size      = tree->unused;
+       int soffset   = vt->inst_offset;
+       int tmpr;
+
+//printf("OP_OUTARG_VT(CEE_LDOBJ(OP_S390_ARGPTR))\n");
+       if (size < 0) { 
+               size = -size;
+               if (start_reg != STK_BASE) {
+                       MONO_EMIT_NEW_MOVE (s, STK_BASE, tree->inst_imm,
+                                           vt->inst_basereg, soffset, size);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, start_reg, 
+                                                STK_BASE, tree->sreg2);
+               } else {
+                       MONO_EMIT_NEW_MOVE (s, STK_BASE, 
+                                           tree->inst_imm+sizeof(gpointer),
+                                           vt->inst_basereg, soffset, size);
+                       tmpr = mono_regstate_next_int (s->rs);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, STK_BASE,
+                                                tree->inst_imm+sizeof(gpointer));
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
+                                                    STK_BASE, tree->inst_imm,
+                                                    tmpr);
+               }
+       } else {
+               if (start_reg != STK_BASE) {
+                       MONO_OUTPUT_VTR (s, size, start_reg, vt->inst_basereg, soffset);
+               } else {
+                       MONO_OUTPUT_VTS (s, size, STK_BASE, 
+                                        tree->inst_imm,
+                                        vt->inst_basereg, soffset);
+               }       
+       }
+}
+
+stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_REGOFFSET)) "0" {
+       MonoInst *vt  = state->left->left->tree;
+       int start_reg = tree->sreg1;
+       int size      = tree->unused;
+       int soffset   = vt->inst_offset;
+       int tmpr;
+
+//printf("OP_OUTARG_VT(CEE_LDOBJ(OP_REGOFFSET))\n");
+       if (size < 0) { 
+               size = -size;
+               if (start_reg != STK_BASE) {
+                       MONO_EMIT_NEW_MOVE (s, STK_BASE, tree->sreg2, 
+                                           vt->inst_basereg, soffset, size);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, start_reg, 
+                                                STK_BASE, tree->sreg2);
+               } else {
+                       MONO_EMIT_NEW_MOVE (s, STK_BASE, 
+                                           tree->sreg2+sizeof(gpointer),
+                                           vt->inst_basereg, soffset, size);
+                       tmpr = mono_regstate_next_int (s->rs);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, STK_BASE,
+                                                tree->sreg2+sizeof(gpointer));
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
+                                                    STK_BASE, tree->sreg2,
+                                                    tmpr);
+               }
+       } else {
+               if (start_reg != STK_BASE) {
+                       MONO_OUTPUT_VTR(s, size, start_reg, vt->inst_basereg, soffset);
+               } else {
+                       MONO_OUTPUT_VTS(s, size, STK_BASE, tree->inst_imm,
+                                         vt->inst_basereg, soffset);
+               }       
+       }
+}
+
+stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_LOADARG)) {
+       MonoInst *vt  = state->left->left->tree;
+       int start_reg = tree->sreg1;
+       int size      = -tree->unused;
+       int soffset   = vt->inst_offset;
+       int tmpr;
+
+//printf("OP_OUTARG_VT(CEE_LDOBJ(OP_S390_LOADARG))\n");
+       if (start_reg != STK_BASE) {
+               MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, start_reg, STK_BASE, soffset);
+               MONO_EMIT_NEW_MOVE (s, STK_BASE, tree->sreg2, start_reg, 0, size);
+               MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, start_reg, 
+                                        STK_BASE, tree->sreg2);
+       } else {
+               MONO_EMIT_NEW_MOVE (s, STK_BASE, 
+                                   tree->inst_imm+sizeof(gpointer),
+                                   vt->inst_basereg, soffset, size);
+               tmpr = mono_regstate_next_int (s->rs);
+               MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, STK_BASE,
+                                        tree->inst_imm+sizeof(gpointer));
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
+                                            STK_BASE, tree->inst_imm,
+                                            tmpr);
+       }
+}
+
 stmt: OP_OUTARG_VT (OP_ICONST) {
-       int start_reg = tree->sreg2;
+       int start_reg = tree->sreg1;
        int size      = tree->unused;
        int nregs     = size / 4;
-       int i;
+
+//printf("OP_OUTARG_VT(OP_ICONST)\n");
        if (start_reg != STK_BASE) {
                if (nregs) {
                        tree->opcode  = OP_SETREGIMM;
@@ -226,31 +436,49 @@ stmt: OP_OUTARG_VT (OP_ICONST) {
                        mono_bblock_add_inst (s->cbb, tree);
                }
        } else {
-               mini_emit_memcpy (s, s->frame_reg, tree->inst_c0, STK_BASE
-                                 tree->inst_offset, size, 0);
+               MONO_OUTPUT_VTS (s, size, STK_BASE, tree->inst_c0
+                                s->frame_reg, tree->inst_offset);
        }
 }
 
 stmt: OP_OUTARG_VT (reg) {
-       int start_reg = tree->sreg2;
+       int start_reg = tree->sreg1;
        int size      = tree->unused;
-       int nregs     = size / 4;
-       int soffset   = tree->inst_imm;
-       int i;
-       if (start_reg != STK_BASE) {
-               for (i = 0; i < nregs; ++i) {
-                       MONO_EMIT_NEW_LOAD_MEMBASE(s, start_reg, s->frame_reg, 
-                                                  tree->inst_offset);
-                       soffset += sizeof(gpointer);
+       int soffset   = tree->sreg2;
+       int tmpr;
+
+//printf("OP_OUTARG_VT(reg)\n");
+       if (size < 0) { 
+               size = -size;
+               if (start_reg != STK_BASE) {
+                       MONO_EMIT_NEW_MOVE (s, STK_BASE, soffset,
+                                           state->left->tree->sreg1,
+                                           tree->inst_imm, size);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, start_reg, 
+                                                STK_BASE, soffset);
+               } else {
+                       MONO_EMIT_NEW_MOVE (s, STK_BASE, 
+                                           soffset+sizeof(gpointer),
+                                           state->left->tree->sreg1,
+                                           tree->inst_imm, size);
+                       tmpr = mono_regstate_next_int (s->rs);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, STK_BASE,
+                                                soffset+sizeof(gpointer));
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
+                                                    STK_BASE, tree->inst_imm,
+                                                    tmpr);
                }
        } else {
-               int tmpr;
-               tmpr = mono_regstate_next_int (s->rs);
-//             MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
-//                                     s->stack_offset);
-printf("OP_OUTARG_VT (reg) size: %d\n",size);
-               mini_emit_memcpy (s, s->frame_reg, soffset, tmpr, 
-                                 tree->sreg1, size, 0);
+               if (start_reg != STK_BASE) {
+                       MONO_OUTPUT_VTR (s, size, start_reg, STK_BASE,
+                                        state->left->tree->inst_offset);
+               } else {
+                       MONO_OUTPUT_VTS (s, size, STK_BASE, soffset, tmpr,
+                                        state->left->tree->inst_offset);
+                       tmpr = mono_regstate_next_int (s->rs);
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, STK_BASE, 
+                                               s->stack_offset);
+               }
        }
 }
 
@@ -353,29 +581,30 @@ reg: OP_CGT_UN (OP_COMPARE (freg, freg)) {
                         state->left->right->reg1);
 }
 
-base: OP_REGOFFSET "0" {
-}
-
 base: OP_S390_STKARG "0" {
        int tmpr;
+
        tmpr = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
-                               (s->stack_offset+state->tree->unused));
+//     MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
+//                             (s->stack_offset+state->tree->unused));
+       MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, s->frame_reg, 0);
        tree->inst_offset  = state->tree->inst_offset;
        tree->inst_basereg = tmpr;
 }
 
 base: OP_LDADDR (OP_S390_LOADARG) "0" {
        int tmpr;
+
        tmpr = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, s->frame_reg, 
-                                   state->left->tree->inst_offset);
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
+                                state->left->tree->inst_offset);
        tree->inst_offset  = 0;
        tree->inst_basereg = tmpr;
 }
 
 base: OP_LDADDR (OP_S390_ARGPTR) "0" {
        int tmpr;
+
        tmpr = mono_regstate_next_int (s->rs);
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
                                 state->left->tree->inst_offset);
@@ -385,9 +614,12 @@ base: OP_LDADDR (OP_S390_ARGPTR) "0" {
 
 base: OP_LDADDR (OP_S390_STKARG) "0" {
        int tmpr;
+
+printf("OP_LDADDR (OP_S390_STKARG)\n");
        tmpr = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
-                                (s->stack_offset + state->left->tree->unused));
+//     MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
+//                              (s->stack_offset + state->left->tree->unused));
+       MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, s->frame_reg, 0);
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, tmpr, 
                                 state->left->tree->inst_offset);
        tree->inst_offset  = 0;
@@ -418,23 +650,16 @@ reg: OP_LDADDR (OP_S390_STKARG) "2" {
 }
 
 reg: CEE_LDOBJ (OP_S390_LOADARG) "1" {
-       int tmpr;
-       tmpr = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, s->frame_reg, 
-                                   state->left->tree->inst_offset);
-       tree->inst_offset  = 0;
-       tree->inst_basereg = tmpr;
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, s->frame_reg, 
+                                state->left->tree->inst_offset);
 }
 
 reg: CEE_LDOBJ (OP_S390_ARGPTR) "1" {
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, s->frame_reg, 
-                                state->left->tree->inst_offset);
-       tree->inst_offset  = 0;
-       tree->inst_basereg = state->reg1;
+                            state->left->tree->inst_offset);
 }
 
 reg: CEE_LDOBJ (OP_S390_STKARG) "1" {
-printf("CEE_LDOBJ (OP_S390_STKARG) 1\n");
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, s->frame_reg,
                                 (s->stack_offset + state->left->tree->unused));
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, state->reg1,
@@ -445,9 +670,9 @@ printf("CEE_LDOBJ (OP_S390_STKARG) 1\n");
 
 base: CEE_LDOBJ (OP_S390_ARGPTR) "0" {
        int tmpr;
-printf("CEE_LDOBJ (OP_S390_ARGPTR) 0\n");
+
        tmpr = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, s->frame_reg, 
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg, 
                                    state->left->tree->inst_offset);
        tree->inst_offset  = 0;
        tree->inst_basereg = tmpr;
@@ -455,7 +680,7 @@ printf("CEE_LDOBJ (OP_S390_ARGPTR) 0\n");
 
 base: CEE_LDOBJ (OP_S390_STKARG) "0" {
        int tmpr;
-printf("CEE_LDOBJ (OP_S390_STKARG) 0\n");
+
        tmpr = mono_regstate_next_int (s->rs);
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, tmpr, s->frame_reg,
                                 (s->stack_offset + state->left->tree->unused));