2008-08-29 Geoff Norton <gnorton@novell.com>

[mono.git] / mono / mini / inssel-s390x.brg

diff --git a/mono/mini/inssel-s390x.brg b/mono/mini/inssel-s390x.brg
index 0b429db2da3dc41fa417d4e0fd175db1b4c1acac..51db23dd407021126548a97154457422d63f4411 100644 (file)
--- a/mono/mini/inssel-s390x.brg
+++ b/mono/mini/inssel-s390x.brg
@@ -30,17 +30,29 @@ stmt: OP_ENDFILTER (reg) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
-reg: CEE_ADD_OVF (reg, reg),
 reg: OP_LADD_OVF (reg, reg),
-reg: CEE_ADD_OVF_UN (reg, reg),
 reg: OP_LADD_OVF_UN (reg, reg),
-reg: CEE_SUB_OVF (reg, reg),
 reg: OP_LSUB_OVF (reg, reg),
-reg: CEE_SUB_OVF_UN (reg, reg),
 reg: OP_LSUB_OVF_UN (reg, reg) "0" {
        MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
 }
 
+reg: CEE_ADD_OVF (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, OP_IADD_OVF, state->reg1, state->left->reg1, state->right->reg1);
+}
+
+reg: CEE_ADD_OVF_UN (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, OP_IADD_OVF_UN, state->reg1, state->left->reg1, state->right->reg1);
+}
+
+reg: CEE_SUB_OVF (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, OP_ISUB_OVF, state->reg1, state->left->reg1, state->right->reg1);
+}
+
+reg: CEE_SUB_OVF_UN (reg, reg) "0" {
+       MONO_EMIT_BIALU (s, tree, OP_ISUB_OVF_UN, state->reg1, state->left->reg1, state->right->reg1);
+}
+
 stmt: CEE_STIND_I8 (OP_REGVAR, reg) {
        MONO_EMIT_NEW_UNALU (s, OP_MOVE, state->left->tree->dreg, state->right->reg1);
 }
@@ -74,13 +86,13 @@ freg: CEE_CONV_R_UN (reg) {
 }
 
 stmt: OP_MEMCPY (reg, reg) "0" {
-       int size = tree->backend.size;
+       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->backend.size;
+       int size = tree->backend.memcpy_args->size;
        if (size > 0)  
                MONO_EMIT_NEW_MOVE (s, state->left->tree->sreg1, 
                                    state->left->tree->inst_offset, 
@@ -106,7 +118,7 @@ reg: OP_LOCALLOC (reg) {
 stmt: OP_SETRET (reg) {
        tree->opcode = OP_MOVE;
        tree->sreg1 = state->left->reg1;
-       tree->dreg = state->left->reg2;
+       tree->dreg = s390_r2;
        mono_bblock_add_inst (s->cbb, tree);
 }
 
@@ -116,6 +128,7 @@ stmt: OP_SETRET (freg) {
                tree->sreg1  = state->left->reg1;
        } else {
                tree->opcode = OP_FMOVE;
+           tree->dreg = s390_f0;
                tree->sreg1  = state->left->reg1;
        }
        mono_bblock_add_inst (s->cbb, tree);
@@ -131,7 +144,7 @@ stmt: OP_SETRET (OP_ICONST) {
 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);
@@ -149,7 +162,7 @@ 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);
@@ -186,7 +199,7 @@ 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);
@@ -227,7 +240,7 @@ 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);
@@ -257,7 +270,7 @@ 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);
@@ -406,7 +419,7 @@ stmt: OP_OUTARG_VT (OP_ICONST) {
 //printf("OP_OUTARG_VT(OP_ICONST) %d\n",nregs);
        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);
@@ -770,13 +783,6 @@ reg: OP_LMUL_OVF_UN (reg, reg) "0" {
        MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
 }
 
-reg: OP_LMUL (reg, OP_I8CONST) {
-       MONO_EMIT_BIALU_IMM (s, tree, OP_LMUL_IMM, state->reg1, state->left->reg1, state->right->tree->inst_c0);
-} cost {
-       MBCOND (mono_arch_is_inst_imm (state->right->tree->inst_c0));
-       return 0;
-}
-
 reg: OP_LSHL (reg, OP_ICONST) {
        MONO_EMIT_BIALU_IMM (s, tree, OP_LSHL_IMM, state->reg1, state->left->reg1, state->right->tree->inst_c0);
 } cost {