projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2008-02-06 Mark Probst <mark.probst@gmail.com>
[mono.git] / mono / mini / inssel-s390.brg
diff --git a/mono/mini/inssel-s390.brg b/mono/mini/inssel-s390.brg
index 2b3a8e97762eff22bd8c4f4a1135dcad784a0ecf..1b7aaf4f8f9783d86f04e46d5b7933fe781aa8d0 100644 (file)
--- a/mono/mini/inssel-s390.brg
+++ b/mono/mini/inssel-s390.brg
@@ -17,7 +17,7 @@ stmt: OP_START_HANDLER {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
-stmt: CEE_ENDFINALLY {
+stmt: OP_ENDFINALLY {
        MonoInst *spvar = mono_find_spvar_for_region (s, s->cbb->region);
        tree->inst_left = spvar;
        mono_bblock_add_inst (s->cbb, tree);
@@ -30,26 +30,42 @@ stmt: OP_ENDFILTER (reg) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
-lreg: OP_LADD_OVF (lreg, lreg) "0" {
-       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
+lreg: OP_LADD (lreg, lreg),
+lreg: OP_LADD_OVF (lreg, lreg),
+lreg: OP_LADD_OVF_UN (lreg, lreg),
+lreg: OP_LSUB (lreg, lreg),
+lreg: OP_LSUB_OVF (lreg, lreg),
+lreg: OP_LSUB_OVF_UN (lreg, lreg) "0" {
+       MONO_EMIT_NEW_UNALU (s, OP_MOVE, s390_r0, state->left->reg1);
+       MONO_EMIT_NEW_UNALU (s, OP_MOVE, s390_r1, state->left->reg2);
+       tree->dreg    = state->reg1;
+       tree->sreg1   = state->right->reg1;
+       tree->sreg2   = state->right->reg2;
+       mono_bblock_add_inst (s->cbb, tree);
 }
 
-lreg: OP_LADD_OVF_UN (lreg, lreg) "0" {
-       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
+lreg: OP_LADD (lreg, i8con) "0" {
+       MONO_EMIT_NEW_ICONST (s, s390_r0, state->right->tree->inst_ls_word);
+       MONO_EMIT_NEW_ICONST (s, s390_r1, state->right->tree->inst_ms_word);
+       tree->dreg    = state->reg1;
+       tree->sreg1   = state->left->reg1;
+       tree->sreg2   = state->left->reg2;
+       mono_bblock_add_inst (s->cbb, tree);
 }
 
-#reg: 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 (lreg, lreg) "0" {
-       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
-}
+lreg: OP_LSUB (lreg, i8con) "0" {
+       int rh,rl;
 
-lreg: OP_LSUB_OVF_UN (lreg, lreg) "0" {
-       MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_UNALU (s, OP_MOVE, s390_r0, state->left->reg1);
+       MONO_EMIT_NEW_UNALU (s, OP_MOVE, s390_r1, state->left->reg2);
+       rh = mono_regstate_next_int (s->rs);
+       MONO_EMIT_NEW_ICONST (s, rh, state->right->tree->inst_ls_word);
+       rl = mono_regstate_next_int (s->rs);
+       MONO_EMIT_NEW_ICONST (s, rl, state->right->tree->inst_ms_word);
+       tree->dreg    = state->reg1;
+       tree->sreg1   = rh;
+       tree->sreg2   = rl;
+       mono_bblock_add_inst (s->cbb, tree);
 }
 
 reg: CEE_ADD_OVF (reg, reg) "0" {
@@ -102,14 +118,14 @@ freg: CEE_CONV_R_UN (reg) {
 }
 
 stmt: OP_MEMCPY (reg, reg) "0" {
-       int size = tree->unused;
+       int size = tree->backend.memcpy_args->size;
        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;
+       int size = tree->backend.memcpy_args->size;
        if (size > 0)  
                MONO_EMIT_NEW_MOVE (s, state->left->tree->sreg1, 
                                    state->left->tree->inst_offset, 
@@ -150,11 +166,11 @@ stmt: OP_SETRET (freg) {
        if (mono_method_signature (s->method)->ret->type == MONO_TYPE_R4) {
                tree->opcode = OP_S390_SETF4RET;
                tree->sreg1  = state->left->reg1;
-               tree->dreg   = s390_f0;
+//             tree->dreg   = s390_f0;
        } else {
                tree->opcode = OP_FMOVE;
                tree->sreg1  = state->left->reg1;
-               tree->dreg   = s390_f0;
+//             tree->dreg   = s390_f0;
        }
        mono_bblock_add_inst (s->cbb, tree);
 }
@@ -166,24 +182,15 @@ 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) {
        MonoCallInst *call = (MonoCallInst*)tree->inst_right;
 
-       tree->opcode = OP_SETREG;
+       tree->opcode = OP_MOVE;
        tree->dreg   = mono_regstate_next_int (s->rs);
        tree->sreg1  = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_MEMBASE (reg) {
@@ -196,12 +203,12 @@ stmt: OP_OUTARG_MEMBASE (reg) {
 stmt: OP_OUTARG (OP_REGVAR) {
        MonoCallInst *call = (MonoCallInst*) tree->inst_right;
 
-       tree->opcode       = OP_SETREG;
+       tree->opcode       = OP_MOVE;
        tree->dreg         = mono_regstate_next_int (s->rs);
        tree->sreg1        = state->left->tree->dreg;
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_MEMBASE (OP_REGVAR) {
@@ -211,44 +218,21 @@ stmt: OP_OUTARG_MEMBASE (OP_REGVAR) {
                                     arg->offset, state->left->tree->dreg);
 }
 
-#stmt: OP_OUTARG (reg) {
-#      if (tree->inst_imm) {
-#              MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->reg1);
-#              return;
-#      }
-#      tree->opcode = OP_SETREG;
-#      tree->dreg = tree->unused;
-#      tree->sreg1 = state->left->reg1;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-
-#stmt: OP_OUTARG (OP_REGVAR) {
-#      if (tree->inst_imm) {
-#              MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->tree->dreg);
-#              return;
-#      }
-#      tree->opcode = OP_SETREG;
-#      tree->dreg = tree->unused;
-#      tree->sreg1 = state->left->tree->dreg;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-
 stmt: OP_OUTARG (lreg) {
        MonoCallInst *call = (MonoCallInst*)tree->inst_right;
        int tdreg;
 
        tdreg = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_UNALU (s, OP_SETREG, tree->unused, state->left->reg2);
+       MONO_EMIT_NEW_UNALU (s, OP_MOVE, tdreg, state->left->reg2);
        
-       mono_call_inst_add_outarg_reg (call, tdreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tdreg, tree->backend.reg3, FALSE);
 
-       tree->opcode = OP_SETREG;
+       tree->opcode = OP_MOVE;
        tree->dreg = mono_regstate_next_int (s->rs);
        tree->sreg1 = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
        
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused + 1, FALSE);
-#      tree->dreg = tree->unused + 1;
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3 + 1, FALSE);
 }
 
 stmt: OP_OUTARG_MEMBASE (lreg) {
@@ -260,19 +244,6 @@ stmt: OP_OUTARG_MEMBASE (lreg) {
                                     arg->offset + 4, state->left->reg1);
 }
 
-#stmt: OP_OUTARG (lreg) {
-#      if (tree->inst_imm) {
-#              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);
-#      tree->opcode = OP_SETREG;
-#      tree->dreg = tree->unused + 1;
-#      tree->sreg1 = state->left->reg1;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-
 stmt: OP_OUTARG (OP_ICONST) {
        MonoCallInst *call = (MonoCallInst*)tree->inst_right;
 
@@ -281,7 +252,7 @@ stmt: OP_OUTARG (OP_ICONST) {
        tree->inst_c0      = state->left->tree->inst_c0;
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_MEMBASE (OP_ICONST) {
@@ -294,12 +265,12 @@ stmt: OP_OUTARG_MEMBASE (OP_ICONST) {
 stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
        MonoCallInst *call = (MonoCallInst*) tree->inst_right;
 
-       tree->opcode       = OP_SETREG;
+       tree->opcode       = OP_MOVE;
        tree->sreg1        = state->left->left->tree->dreg;
        tree->dreg         = mono_regstate_next_int (s->rs);
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_MEMBASE (CEE_LDIND_REF (OP_REGVAR)) {
@@ -309,34 +280,6 @@ stmt: OP_OUTARG_MEMBASE (CEE_LDIND_REF (OP_REGVAR)) {
                                         arg->offset, state->left->tree->inst_c0);
 }
 
-#stmt: OP_OUTARG (OP_ICONST) {
-#      if (tree->inst_imm) {
-#              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;
-#      tree->dreg = tree->unused;
-#      tree->inst_c0 = state->left->tree->inst_c0;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-
-#stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
-#      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;
-#      }
-#      tree->opcode = OP_SETREG;
-#      tree->sreg1 = state->left->left->tree->dreg;
-#      tree->dreg = tree->unused;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-
-stmt: OP_OUTARG (OP_LDADDR (OP_S390_LOADARG)) {
-       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_MEMBASE (OP_LDADDR (OP_S390_LOADARG)) {
        MonoCallArgParm *arg = (MonoCallArgParm *) tree; 
 
@@ -344,37 +287,32 @@ stmt: OP_OUTARG_MEMBASE (OP_LDADDR (OP_S390_LOADARG)) {
                                     arg->offset, state->left->left->tree->dreg);
 }
 
-#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);
-#}
+freg: OP_FCONV_TO_R4 (freg) "0" {
+       /* The conversion is done elsewhere */
+       MONO_EMIT_UNALU (s, tree, OP_FMOVE, state->reg1, state->left->reg1);
+}
 
 stmt: OP_OUTARG_R4 (freg) {
        MonoCallInst *call = (MonoCallInst*)tree->inst_right;
 
-       tree->opcode = OP_FCONV_TO_R4;
+       tree->opcode = OP_S390_SETF4RET;
        tree->dreg   = mono_regstate_next_float (s->rs);
        tree->sreg1  = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, TRUE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, TRUE);
 }
 
 stmt: OP_OUTARG_R8 (freg),
 stmt: OP_OUTARG (freg) {
        MonoCallInst *call = (MonoCallInst*)tree->inst_right;
 
-       tree->opcode = OP_SETFREG;
+       tree->opcode = OP_FMOVE;
        tree->dreg   = mono_regstate_next_float (s->rs);
        tree->sreg1  = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, TRUE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, TRUE);
 }
 
 stmt: OP_OUTARG_MEMBASE (freg) {
@@ -395,53 +333,18 @@ stmt: OP_OUTARG_MEMBASE (freg) {
        }
 }
 
-#stmt: OP_OUTARG_R4 (freg) {
-#      if (tree->inst_imm) {
-#              MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER4_MEMBASE_REG, STK_BASE, tree->inst_imm, state->left->reg1);
-#              return;
-#      }
-#      tree->opcode = OP_SETFREG;
-#      tree->sreg1 = state->left->reg1;
-#      tree->dreg = tree->unused;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-#
-#stmt: OP_OUTARG_R8 (freg) {
-#      if (tree->inst_imm) {
-#              MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER8_MEMBASE_REG, STK_BASE, 
-#                                           tree->inst_imm, state->left->reg1);
-#              return;
-#      }
-#      tree->opcode = OP_SETFREG;
-#      tree->sreg1 = state->left->reg1;
-#      tree->dreg = tree->unused;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-
 stmt: OP_OUTARG_R4 (CEE_LDOBJ (OP_REGOFFSET)),
 stmt: OP_OUTARG_R8 (CEE_LDOBJ (OP_REGOFFSET)) {
        MonoCallInst *call = (MonoCallInst*)tree->inst_right;
 
-       tree->opcode = OP_SETFREG;
+       tree->opcode = OP_FMOVE;
        tree->dreg   = mono_regstate_next_float (s->rs);
        tree->sreg1  = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, TRUE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, TRUE);
 }
 
-#stmt: OP_OUTARG_R8 (CEE_LDOBJ (OP_REGOFFSET)) {
-#      if (tree->inst_imm) {
-#              MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER8_MEMBASE_REG, STK_BASE, 
-#                                           tree->inst_imm, state->left->reg1);
-#              return;
-#      }
-#      tree->opcode = OP_SETFREG;
-#      tree->sreg1 = state->left->reg1;
-#      tree->dreg = tree->unused;
-#      mono_bblock_add_inst (s->cbb, tree);
-#}
-
 freg: OP_FCONV_TO_R4 (CEE_LDOBJ (OP_REGOFFSET)) {
        MonoInst *vt = state->left->left->tree;
  
@@ -451,9 +354,9 @@ freg: OP_FCONV_TO_R4 (CEE_LDOBJ (OP_REGOFFSET)) {
 }
 
 freg: OP_FCONV_TO_R8 (CEE_LDOBJ (OP_REGOFFSET)) {
-       tree->opcode = OP_SETFREG;
+       tree->opcode = OP_FMOVE;
        tree->sreg1 = state->left->reg1;
-       tree->dreg = tree->unused;
+       tree->dreg = tree->backend.reg3;
        mono_bblock_add_inst (s->cbb, tree);
 }
 
@@ -476,7 +379,7 @@ stmt: OP_OUTARG_VT (CEE_LDOBJ (base)) {
                                           vt->inst_basereg, soffset, size);
                        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, 
                                                 STK_BASE, arg->offPrm);
-                       mono_call_inst_add_outarg_reg (call, treg, start_reg, FALSE);
+                       mono_call_inst_add_outarg_reg (s, call, treg, start_reg, FALSE);
                } else { 
                        MONO_EMIT_NEW_MOVE(s, STK_BASE, arg->offPrm,
                                           vt->inst_basereg, soffset, size);
@@ -502,33 +405,14 @@ stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_ARGPTR)) {
        int start_reg = tree->sreg1;
        int size      = arg->size;
        int soffset   = vt->inst_offset;
-       int treg;
 
-//printf("OP_OUTARG_VT(CEE_LDOBJ(OP_S390_ARGPTR))\n");
-       if (size < 0) { 
-               size = -size;
-               treg = mono_regstate_next_int (s->rs);
-               if (start_reg != STK_BASE) {
-                       MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offset,
-                                           vt->inst_basereg, soffset, size);
-                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
-                                                STK_BASE, arg->offPrm);
-                       mono_call_inst_add_outarg_reg (call, treg, start_reg, FALSE);
-               } else {
-                       MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
-                                           vt->inst_basereg, soffset, size);
-                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE, arg->offPrm);
-                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
-                                                    STK_BASE, arg->offset, treg);
-               }
+       if (start_reg != STK_BASE) {
+               MONO_OUTPUT_VTR (s, size, start_reg, vt->inst_basereg, soffset);
        } 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, arg->offset,
-                                        vt->inst_basereg, soffset);
-               }       
-       }
+               
+               MONO_OUTPUT_VTS (s, size, STK_BASE, arg->offset,
+                                vt->inst_basereg, soffset);
+       }       
 }
 
 stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_REGOFFSET)) "0" {
@@ -552,7 +436,7 @@ stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_REGOFFSET)) "0" {
                                            vt->inst_basereg, soffset, size);
                        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
                                                 STK_BASE, arg->offPrm);
-                       mono_call_inst_add_outarg_reg (call, treg, start_reg, FALSE);
+                       mono_call_inst_add_outarg_reg (s, call, treg, start_reg, FALSE);
                } else {
                        MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
                                            vt->inst_basereg, soffset, size);
@@ -575,23 +459,43 @@ stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_LOADARG)) {
        MonoCallArgParm *arg = (MonoCallArgParm *) tree; 
        MonoInst *vt         = state->left->left->tree;
        
-       int start_reg = tree->sreg1;
+       int start_reg = tree->inst_basereg;
        int size      = -arg->size;
        int soffset   = vt->inst_offset;
        int treg;
 
 //printf("OP_OUTARG_VT(CEE_LDOBJ(OP_S390_LOADARG))\n");
        treg = mono_regstate_next_int (s->rs);
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, treg, s->frame_reg);
+       MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, treg, vt->backend.arg_info);
+       MONO_EMIT_NEW_MOVE (s, STK_BASE, soffset, treg, 0, size);
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE, soffset);
        if (start_reg != STK_BASE) {
-               MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE, soffset);
-               MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm, treg, 0, size);
-               MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
-                                        STK_BASE, arg->offPrm);
-               mono_call_inst_add_outarg_reg (call, treg, start_reg, FALSE);
+               mono_call_inst_add_outarg_reg (s, call, treg, start_reg, FALSE);
+       } else {
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
+                                            STK_BASE, arg->offset, treg);
+       }
+}
+
+stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_ARGREG)) {
+       MonoCallInst *call   = (MonoCallInst*) tree->inst_right;
+       MonoCallArgParm *arg = (MonoCallArgParm *) tree; 
+       MonoInst *vt         = state->left->left->tree;
+       
+       int base_reg = tree->inst_basereg;
+       int size     = -arg->size;
+       int soffset  = vt->inst_offset;
+       int treg;
+
+//printf("OP_OUTARG_VT(CEE_LDOBJ(OP_S390_ARGREG))\n");
+       treg = mono_regstate_next_int (s->rs);
+       MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, s->frame_reg, soffset);
+       MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm, treg, 0, size);
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE, arg->offPrm);
+       if (base_reg != STK_BASE) {
+               mono_call_inst_add_outarg_reg (s, call, treg, base_reg, FALSE);
        } else {
-               MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
-                                   vt->inst_basereg, soffset, size);
-               MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE, arg->offPrm);
                MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, 
                                             STK_BASE, arg->offset, treg);
        }
@@ -608,11 +512,11 @@ stmt: OP_OUTARG_VT (OP_ICONST) {
 //printf("OP_OUTARG_VT(OP_ICONST)\n");
        if (start_reg != STK_BASE) {
                if (nregs) {
-                       tree->opcode  = OP_SETREGIMM;
+                       tree->opcode  = OP_ICONST;
                        tree->dreg    = mono_regstate_next_int (s->rs);
                        tree->inst_c0 = state->left->tree->inst_c0;
                        mono_bblock_add_inst (s->cbb, tree);
-                       mono_call_inst_add_outarg_reg (call, tree->dreg, start_reg, FALSE);
+                       mono_call_inst_add_outarg_reg (s, call, tree->dreg, start_reg, FALSE);
                }
        } else {
                MONO_OUTPUT_VTS (s, size, STK_BASE, tree->inst_c0, 
@@ -637,7 +541,7 @@ stmt: OP_OUTARG_VT (reg) {
                                            0, size);
                        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
                                                 STK_BASE, arg->offPrm);
-                       mono_call_inst_add_outarg_reg (call, treg, start_reg, FALSE);
+                       mono_call_inst_add_outarg_reg (s, call, treg, start_reg, FALSE);
                } else {
                        MONO_EMIT_NEW_MOVE (s, STK_BASE, soffset+size, state->left->reg1,
                                            0, size);
@@ -650,9 +554,9 @@ stmt: OP_OUTARG_VT (reg) {
                if (start_reg != STK_BASE) {
                        MONO_OUTPUT_VTR (s, size, start_reg, STK_BASE, soffset);
                } else {
+                       treg = mono_regstate_next_int (s->rs);
                        MONO_OUTPUT_VTS (s, size, STK_BASE, soffset, treg,
                                         state->left->tree->inst_offset);
-                       treg = mono_regstate_next_int (s->rs);
                        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE, 
                                                 s->stack_offset);
                }
@@ -768,8 +672,7 @@ base: OP_S390_STKARG "0" {
        int treg;
 
        treg = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, STK_BASE, 0);
-//     MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, s->frame_reg, 0);
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, treg, s->frame_reg);
        tree->inst_offset  = state->tree->inst_offset;
        tree->inst_basereg = treg;
 }
@@ -783,8 +686,8 @@ base: OP_LDADDR (OP_S390_LOADARG) "0" {
        int treg;
 
        treg = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, s->frame_reg, 
-                                state->left->tree->inst_offset);
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, treg, s->frame_reg);
+       MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, treg, state->left->tree->backend.arg_info);
        tree->inst_offset  = 0;
        tree->inst_basereg = treg;
 }
@@ -802,19 +705,21 @@ base: OP_LDADDR (OP_S390_ARGPTR) "0" {
 base: OP_LDADDR (OP_S390_STKARG) "0" {
        int treg;
 
+printf("base: OP_LDADDR(OP_S390_STKARG) 0\n");
        treg = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, STK_BASE, 0);
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, treg, s->frame_reg);
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, treg, 
                                 state->left->tree->inst_offset);
        tree->inst_offset  = 0;
        tree->inst_basereg = treg;
 }
 
-reg: OP_LDADDR (OP_S390_LOADARG) "2" {
-       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;
+reg: OP_LDADDR (OP_S390_LOADARG) {
+       int treg;
+
+       treg = mono_regstate_next_int (s->rs);
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, treg, s->frame_reg);
+       MONO_EMIT_NEW_LOAD_MEMBASE (s, state->reg1, treg, state->left->tree->inst_offset);
 }
 
 reg: OP_LDADDR (OP_S390_ARGPTR) "2" {
@@ -825,10 +730,10 @@ reg: OP_LDADDR (OP_S390_ARGPTR) "2" {
 }
 
 reg: OP_LDADDR (OP_S390_STKARG) "2" {
-       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, 
-                                state->left->tree->inst_offset);
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, state->reg1, s->frame_reg);
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, state->reg1,
+                                (state->left->tree->backend.arg_info +
+                                 state->left->tree->inst_offset));
        tree->inst_offset  = 0;
        tree->inst_basereg = state->reg1;
 }
@@ -844,10 +749,11 @@ reg: CEE_LDOBJ (OP_S390_ARGPTR) "1" {
 }
 
 reg: CEE_LDOBJ (OP_S390_STKARG) "1" {
-       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, s->frame_reg,
-                                (s->stack_offset + state->left->tree->unused));
+printf("reg: CEE_LDOBJ(OP_S390_STKARG)\n");
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, state->reg1, s->frame_reg);
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, state->reg1,
-                                state->left->tree->inst_offset);
+                                (state->left->tree->inst_offset + 
+                                 state->left->tree->backend.arg_info));
        tree->inst_offset  = 0;
        tree->inst_basereg = state->reg1;
 }
@@ -866,8 +772,8 @@ base: CEE_LDOBJ (OP_S390_STKARG) "0" {
        int treg;
 
        treg = mono_regstate_next_int (s->rs);
-       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, s->frame_reg,
-                                (s->stack_offset + state->left->tree->unused));
+       MONO_EMIT_NEW_UNALU (s, OP_S390_BKCHAIN, treg, s->frame_reg);
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, treg, state->left->tree->backend.arg_info);
        MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, treg, state->left->tree->inst_offset);
        tree->inst_offset  = 0;
        tree->inst_basereg = treg;
my mono mirror. check out Moved to http://github.com/mono/mono