X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Finssel-s390.brg;h=74758869c9171d4bbdb390ce465f099e226b2f4b;hb=279b47e476642431c7f96e105ed32f133d6ed5a3;hp=226255b2a7636cea2eb9bae46489ef23f4ba3e56;hpb=b39d5edf62fb3908e10647e1a7e60dadeb88b2be;p=mono.git diff --git a/mono/mini/inssel-s390.brg b/mono/mini/inssel-s390.brg index 226255b2a76..74758869c91 100644 --- 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); @@ -36,8 +36,8 @@ 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_SETREG, s390_r0, state->left->reg1); - MONO_EMIT_NEW_UNALU (s, OP_SETREG, s390_r1, state->left->reg2); + 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; @@ -56,8 +56,8 @@ lreg: OP_LADD (lreg, i8con) "0" { lreg: OP_LSUB (lreg, i8con) "0" { int rh,rl; - MONO_EMIT_NEW_UNALU (s, OP_SETREG, s390_r0, state->left->reg1); - MONO_EMIT_NEW_UNALU (s, OP_SETREG, s390_r1, state->left->reg2); + 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); @@ -118,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, @@ -166,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); } @@ -185,12 +185,12 @@ 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); - mono_call_inst_add_outarg_reg (s, 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) { @@ -203,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 (s, 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) { @@ -223,16 +223,16 @@ stmt: OP_OUTARG (lreg) { int tdreg; tdreg = mono_regstate_next_int (s->rs); - MONO_EMIT_NEW_UNALU (s, OP_SETREG, tdreg, state->left->reg2); + MONO_EMIT_NEW_UNALU (s, OP_MOVE, tdreg, state->left->reg2); - mono_call_inst_add_outarg_reg (s, 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 (s, call, tree->dreg, tree->unused + 1, FALSE); + mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3 + 1, FALSE); } stmt: OP_OUTARG_MEMBASE (lreg) { @@ -252,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 (s, 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) { @@ -265,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 (s, 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)) { @@ -300,19 +300,19 @@ stmt: OP_OUTARG_R4 (freg) { tree->sreg1 = state->left->reg1; mono_bblock_add_inst (s->cbb, tree); - mono_call_inst_add_outarg_reg (s, 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 (s, 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) { @@ -337,12 +337,12 @@ 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 (s, call, tree->dreg, tree->unused, TRUE); + mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->backend.reg3, TRUE); } freg: OP_FCONV_TO_R4 (CEE_LDOBJ (OP_REGOFFSET)) { @@ -354,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); } @@ -467,7 +467,7 @@ stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_LOADARG)) { //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->unused); + 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) { @@ -512,7 +512,7 @@ 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); @@ -687,7 +687,7 @@ base: OP_LDADDR (OP_S390_LOADARG) "0" { 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, state->left->tree->unused); + MONO_EMIT_NEW_LOAD_MEMBASE (s, treg, treg, state->left->tree->backend.arg_info); tree->inst_offset = 0; tree->inst_basereg = treg; } @@ -732,7 +732,7 @@ reg: OP_LDADDR (OP_S390_ARGPTR) "2" { reg: OP_LDADDR (OP_S390_STKARG) "2" { 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->unused + + (state->left->tree->backend.arg_info + state->left->tree->inst_offset)); tree->inst_offset = 0; tree->inst_basereg = state->reg1; @@ -753,7 +753,7 @@ 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->unused)); + state->left->tree->backend.arg_info)); tree->inst_offset = 0; tree->inst_basereg = state->reg1; } @@ -773,7 +773,7 @@ base: CEE_LDOBJ (OP_S390_STKARG) "0" { treg = mono_regstate_next_int (s->rs); 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->unused); + 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;