Author: zoltan
Date: 2008-02-06 02:26:03 -0500 (Wed, 06 Feb 2008)
New Revision: 94995
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/cpu-arm.md
trunk/mono/mono/mini/cpu-hppa.md
trunk/mono/mono/mini/cpu-mips.md
trunk/mono/mono/mini/cpu-ppc.md
trunk/mono/mono/mini/cpu-s390.md
trunk/mono/mono/mini/cpu-s390x.md
trunk/mono/mono/mini/inssel-arm.brg
trunk/mono/mono/mini/inssel-hppa.brg
trunk/mono/mono/mini/inssel-mips.brg
trunk/mono/mono/mini/inssel-ppc.brg
trunk/mono/mono/mini/inssel-s390.brg
trunk/mono/mono/mini/inssel-s390x.brg
trunk/mono/mono/mini/inssel-sparc.brg
trunk/mono/mono/mini/mini-alpha.c
trunk/mono/mono/mini/mini-arm.c
trunk/mono/mono/mini/mini-codegen.c
trunk/mono/mono/mini/mini-hppa.c
trunk/mono/mono/mini/mini-mips.c
trunk/mono/mono/mini/mini-ops.h
trunk/mono/mono/mini/mini-ppc.c
trunk/mono/mono/mini/mini-s390.c
trunk/mono/mono/mini/mini-s390x.c
trunk/mono/mono/mini/mini-sparc.c
Log:
2008-02-06 Zoltan Varga <[EMAIL PROTECTED]>
* *.brg mini-<ARCH>.c cpu-<ARCH>.md: Get rid of
OP_SETREG/OP_SETFREG/OP_SETREGIMM,
use OP_MOVE/OP_FMOVE/OP_ICONST instead.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/ChangeLog 2008-02-06 07:26:03 UTC (rev 94995)
@@ -1,3 +1,8 @@
+2008-02-06 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * *.brg mini-<ARCH>.c cpu-<ARCH>.md: Get rid of
OP_SETREG/OP_SETFREG/OP_SETREGIMM,
+ use OP_MOVE/OP_FMOVE/OP_ICONST instead.
+
2008-02-05 Zoltan Varga <[EMAIL PROTECTED]>
* cpu-amd64.md (move): Correct the maximum size of move.
Modified: trunk/mono/mono/mini/cpu-arm.md
===================================================================
--- trunk/mono/mono/mini/cpu-arm.md 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/cpu-arm.md 2008-02-06 07:26:03 UTC (rev 94995)
@@ -133,9 +133,6 @@
outarg_imm: len:16
setret: dest:a src1:i len:4
setlret: src1:i src2:i len:12
-setreg: dest:i src1:i len:4 clob:r
-setregimm: dest:i len:16 clob:r
-setfreg: dest:f src1:f len:4 clob:r
checkthis: src1:b len:4
voidcall: len:20 clob:c
voidcall_reg: src1:i len:8 clob:c
Modified: trunk/mono/mono/mini/cpu-hppa.md
===================================================================
--- trunk/mono/mono/mini/cpu-hppa.md 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/cpu-hppa.md 2008-02-06 07:26:03 UTC (rev 94995)
@@ -129,8 +129,6 @@
outarg_imm: len:5
setret: dest:a src1:i len:4
setlret: dest:a src1:i len:8
-setreg: dest:i src1:i len:4 clob:r
-setfreg: dest:f src1:f len:4 clob:r
checkthis: src1:b len:4
oparglist: src1:i len:64
call: dest:a clob:c len:32
Modified: trunk/mono/mono/mini/cpu-mips.md
===================================================================
--- trunk/mono/mono/mini/cpu-mips.md 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/cpu-mips.md 2008-02-06 07:26:03 UTC (rev 94995)
@@ -157,9 +157,6 @@
outarg_imm: len:5
setret: dest:v src1:i len:4
setlret: src1:i src2:i len:12
-setreg: dest:i src1:i len:8 clob:r
-setregimm: dest:i len:8 clob:r
-setfreg: dest:f src1:f len:8 clob:r
checkthis: src1:b len:4
voidcall: len:20 clob:c
voidcall_reg: src1:i len:20 clob:c
Modified: trunk/mono/mono/mini/cpu-ppc.md
===================================================================
--- trunk/mono/mono/mini/cpu-ppc.md 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/cpu-ppc.md 2008-02-06 07:26:03 UTC (rev 94995)
@@ -132,9 +132,6 @@
outarg_imm: len:5
setret: dest:a src1:i len:4
setlret: src1:i src2:i len:12
-setreg: dest:i src1:i len:4 clob:r
-setregimm: dest:i len:8 clob:r
-setfreg: dest:f src1:f len:4 clob:r
checkthis: src1:b len:4
voidcall: len:16 clob:c
voidcall_reg: src1:i len:8 clob:c
Modified: trunk/mono/mono/mini/cpu-s390.md
===================================================================
--- trunk/mono/mono/mini/cpu-s390.md 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/cpu-s390.md 2008-02-06 07:26:03 UTC (rev 94995)
@@ -224,10 +224,7 @@
tls_get: dest:i len:44
sbb: dest:i src1:i src2:i len:8
sbb_imm: dest:i src1:i len:18
-setfreg: dest:f src1:f len:4
setlret: src1:i src2:i len:12
-setreg: dest:i src1:i len:4
-setregimm: dest:i len:18
setret: dest:a src1:i len:6
shl: dest:i src1:i src2:i clob:s len:8
shl_imm: dest:i src1:i len:8
Modified: trunk/mono/mono/mini/cpu-s390x.md
===================================================================
--- trunk/mono/mono/mini/cpu-s390x.md 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/cpu-s390x.md 2008-02-06 07:26:03 UTC (rev 94995)
@@ -304,9 +304,6 @@
s390_setf4ret: dest:f src1:f len:4
sbb: dest:i src1:i src2:i len:6
sbb_imm: dest:i src1:i len:14
-setfreg: dest:f src1:f len:4
-setreg: dest:i src1:i len:4
-setregimm: dest:i len:20
setret: dest:a src1:i len:4
sext_i4: dest:i src1:i len:4
shl: dest:i src1:i src2:i clob:s len:6
Modified: trunk/mono/mono/mini/inssel-arm.brg
===================================================================
--- trunk/mono/mono/mini/inssel-arm.brg 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/inssel-arm.brg 2008-02-06 07:26:03 UTC (rev 94995)
@@ -160,7 +160,7 @@
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);
@@ -170,7 +170,7 @@
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);
@@ -182,7 +182,7 @@
MonoCallInst *call = (MonoCallInst*)tree->inst_right;
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);
/* An #if would be better here, but monoburg
strips them out as comments */
@@ -191,7 +191,7 @@
else
mono_call_inst_add_outarg_reg (s, call, tdreg,
tree->backend.reg3 + 1, 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);
@@ -214,7 +214,7 @@
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);
@@ -230,7 +230,7 @@
/* same as the OUTARG (lreg) case */
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);
/* An #if would be better here, but monoburg
strips them out as comments */
@@ -239,7 +239,7 @@
else
mono_call_inst_add_outarg_reg (s, call, tdreg,
tree->backend.reg3 + 1, 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);
@@ -282,7 +282,7 @@
} else {
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG,
ARMREG_SP, offset, state->left->reg2);
}
- tree->opcode = OP_SETREG;
+ tree->opcode = OP_MOVE;
tree->dreg = mono_regstate_next_int (s->rs);
tree->sreg1 = G_BYTE_ORDER == G_BIG_ENDIAN? state->left->reg2:
state->left->reg1;
mono_bblock_add_inst (s->cbb, tree);
@@ -345,7 +345,7 @@
tmpr = mono_regstate_next_int (s->rs);
dreg = mono_regstate_next_int (s->rs);
MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, vt->inst_basereg, soffset);
- MONO_EMIT_NEW_UNALU (s, OP_SETREG, dreg, tmpr);
+ MONO_EMIT_NEW_UNALU (s, OP_MOVE, dreg, tmpr);
mono_call_inst_add_outarg_reg (s, call, dreg, start_reg + i,
FALSE);
soffset += sizeof (gpointer);
}
@@ -374,7 +374,7 @@
int start_reg = tree->backend.arg_info & 0xff;
int nregs = (tree->backend.arg_info >> 8) & 0xff;
if (nregs) {
- tree->opcode = OP_SETREG;
+ tree->opcode = OP_MOVE;
tree->dreg = start_reg;
tree->sreg1 = state->left->reg1;
mono_bblock_add_inst (s->cbb, tree);
Modified: trunk/mono/mono/mini/inssel-hppa.brg
===================================================================
--- trunk/mono/mono/mini/inssel-hppa.brg 2008-02-06 05:37:38 UTC (rev
94994)
+++ trunk/mono/mono/mini/inssel-hppa.brg 2008-02-06 07:26:03 UTC (rev
94995)
@@ -73,7 +73,7 @@
MonoCallInst *call = tree->inst_call;
MonoHPPAArgInfo *ai = tree->backend.data;
- 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);
@@ -95,7 +95,7 @@
MonoCallInst *call = tree->inst_call;
MonoHPPAArgInfo *ai = tree->backend.data;
- 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);
@@ -107,9 +107,9 @@
MonoHPPAArgInfo *ai = tree->backend.data;
int 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, ai->reg, 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);
@@ -131,7 +131,7 @@
MonoCallInst *call = tree->inst_call;
MonoHPPAArgInfo *ai = tree->backend.data;
- tree->opcode = OP_SETREG;
+ tree->opcode = OP_MOVE;
tree->dreg = mono_regstate_next_int (s->rs);
tree->sreg1 = state->left->left->tree->dreg;
mono_bblock_add_inst (s->cbb, tree);
@@ -156,7 +156,7 @@
if (size < sizeof (gpointer))
MONO_EMIT_NEW_BIALU_IMM (s, OP_SHR_IMM, dreg,
tmpr, (sizeof (gpointer) - size) * 8);
else
- MONO_EMIT_NEW_UNALU (s, OP_SETREG, dreg, tmpr);
+ MONO_EMIT_NEW_UNALU (s, OP_MOVE, dreg, tmpr);
mono_call_inst_add_outarg_reg (s, call, dreg, start_reg
+ i, FALSE);
soffset += sizeof (gpointer);
size -= sizeof (gpointer);
@@ -191,7 +191,7 @@
stmt: OP_OUTARG (freg) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -289,7 +289,7 @@
if (mono_method_signature (s->method)->ret->type == MONO_TYPE_R4) {
tree->opcode = OP_HPPA_SETF4REG;
} else {
- tree->opcode = OP_SETFREG;
+ tree->opcode = OP_FMOVE;
}
tree->sreg1 = state->left->reg1;
Modified: trunk/mono/mono/mini/inssel-mips.brg
===================================================================
--- trunk/mono/mono/mini/inssel-mips.brg 2008-02-06 05:37:38 UTC (rev
94994)
+++ trunk/mono/mono/mini/inssel-mips.brg 2008-02-06 07:26:03 UTC (rev
94995)
@@ -103,7 +103,7 @@
# guint32 sreg2 = mips_zero;
#
# if (state->left->right->tree->inst_c0) {
-# MONO_EMIT_NEW_UNALU (s, OP_SETREGIMM, mips_at,
+# MONO_EMIT_NEW_UNALU (s, OP_ICONST, mips_at,
# state->left->right->tree->inst_c0);
# sreg2 = mips_at;
# }
@@ -121,7 +121,7 @@
# guint32 sreg2 = mips_zero;
#
# if (state->left->right->tree->inst_c0) {
-# MONO_EMIT_NEW_UNALU (s, OP_SETREGIMM, mips_at,
state->left->right->tree->inst_c0);
+# MONO_EMIT_NEW_UNALU (s, OP_ICONST, mips_at,
state->left->right->tree->inst_c0);
# sreg2 = mips_at;
# }
# tree->opcode = OP_MIPS_BEQ;
@@ -137,7 +137,7 @@
# guint32 sreg2 = mips_zero;
#
# if (state->left->right->tree->inst_c0) {
-# MONO_EMIT_NEW_UNALU (s, OP_SETREGIMM, mips_at,
state->left->right->tree->inst_c0);
+# MONO_EMIT_NEW_UNALU (s, OP_ICONST, mips_at,
state->left->right->tree->inst_c0);
# sreg2 = mips_at;
# }
# tree->opcode = OP_MIPS_BEQ;
@@ -158,7 +158,7 @@
# guint32 sreg2 = mips_zero;
#
# if (state->left->right->tree->inst_c0) {
-# MONO_EMIT_NEW_UNALU (s, OP_SETREGIMM, mips_at,
+# MONO_EMIT_NEW_UNALU (s, OP_ICONST, mips_at,
# state->left->right->tree->inst_c0);
# sreg2 = mips_at;
# }
@@ -280,7 +280,7 @@
if (mips_is_imm16 (n))
MONO_EMIT_NEW_BIALU_IMM (s, OP_MIPS_SLTIU, mips_at,
state->left->reg1, n);
else {
- MONO_EMIT_NEW_UNALU (s, OP_SETREGIMM, mips_at, n);
+ MONO_EMIT_NEW_UNALU (s, OP_ICONST, mips_at, n);
MONO_EMIT_NEW_BIALU (s, OP_MIPS_SLTU, mips_at,
state->left->reg1, mips_at);
}
MONO_EMIT_NEW_BIALU_IMM (s, OP_MIPS_XORI, mips_at, mips_at, 1);
@@ -418,7 +418,7 @@
stmt: OP_OUTARG (reg) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -428,7 +428,7 @@
stmt: OP_OUTARG (OP_REGVAR) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -439,9 +439,9 @@
MonoCallInst *call = tree->inst_call;
int 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->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);
@@ -451,7 +451,7 @@
stmt: OP_OUTARG (OP_ICONST) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -461,7 +461,7 @@
stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
MonoCallInst *call = tree->inst_call;
- tree->opcode = OP_SETREG;
+ tree->opcode = OP_MOVE;
tree->dreg = mono_regstate_next_int (s->rs);
tree->sreg1 = state->left->left->tree->dreg;
mono_bblock_add_inst (s->cbb, tree);
@@ -471,7 +471,7 @@
stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -491,7 +491,7 @@
/* MONO_EMIT_NEW_UNALU (s, OP_FCONV_TO_R4, mips_ftemp,
state->left->reg1); */
/* MONO_EMIT_NEW_UNALU (s, OP_MIPS_MFC1S, tree->unused & 0xff,
mips_ftemp); */
- 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);
@@ -508,7 +508,7 @@
tmpr = mono_regstate_next_float (s->rs);
MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADR4_MEMBASE, tmpr,
vt->inst_basereg, soffset);
dreg = mono_regstate_next_float (s->rs);
- MONO_EMIT_NEW_UNALU (s, OP_SETFREG, dreg, tmpr);
+ MONO_EMIT_NEW_UNALU (s, OP_FMOVE, dreg, tmpr);
mono_call_inst_add_outarg_reg (s, call, dreg, tree->backend.reg3, TRUE);
}
@@ -640,7 +640,7 @@
//g_printf ("OP_OUTARG_VT: ICONST\n");
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);
@@ -658,7 +658,7 @@
//g_printf ("OP_OUTARG_VT: reg\n");
if (nregs) {
- 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);
Modified: trunk/mono/mono/mini/inssel-ppc.brg
===================================================================
--- trunk/mono/mono/mini/inssel-ppc.brg 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/inssel-ppc.brg 2008-02-06 07:26:03 UTC (rev 94995)
@@ -234,7 +234,7 @@
stmt: OP_OUTARG (reg) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -244,7 +244,7 @@
stmt: OP_OUTARG (OP_REGVAR) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -255,9 +255,9 @@
MonoCallInst *call = tree->inst_call;
int 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->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);
@@ -267,7 +267,7 @@
stmt: OP_OUTARG (OP_ICONST) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -277,7 +277,7 @@
stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
MonoCallInst *call = tree->inst_call;
- tree->opcode = OP_SETREG;
+ tree->opcode = OP_MOVE;
tree->dreg = mono_regstate_next_int (s->rs);
tree->sreg1 = state->left->left->tree->dreg;
mono_bblock_add_inst (s->cbb, tree);
@@ -294,7 +294,7 @@
stmt: OP_OUTARG (freg) {
MonoCallInst *call = tree->inst_call;
- 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);
@@ -311,7 +311,7 @@
tmpr = mono_regstate_next_float (s->rs);
MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADR4_MEMBASE, tmpr,
vt->inst_basereg, soffset);
dreg = mono_regstate_next_float (s->rs);
- MONO_EMIT_NEW_UNALU (s, OP_SETFREG, dreg, tmpr);
+ MONO_EMIT_NEW_UNALU (s, OP_FMOVE, dreg, tmpr);
mono_call_inst_add_outarg_reg (s, call, dreg, tree->backend.reg3, TRUE);
}
@@ -338,7 +338,7 @@
else
MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI2_MEMBASE,
tmpr, vt->inst_basereg, soffset);
dreg = mono_regstate_next_int (s->rs);
- MONO_EMIT_NEW_UNALU (s, OP_SETREG, dreg, tmpr);
+ MONO_EMIT_NEW_UNALU (s, OP_MOVE, dreg, tmpr);
mono_call_inst_add_outarg_reg (s, call, dreg, start_reg, FALSE);
} else
#endif
@@ -346,7 +346,7 @@
tmpr = mono_regstate_next_int (s->rs);
MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, vt->inst_basereg, soffset);
dreg = mono_regstate_next_int (s->rs);
- MONO_EMIT_NEW_UNALU (s, OP_SETREG, dreg, tmpr);
+ MONO_EMIT_NEW_UNALU (s, OP_MOVE, dreg, tmpr);
mono_call_inst_add_outarg_reg (s, call, dreg, start_reg + i,
FALSE);
soffset += sizeof (gpointer);
}
@@ -362,7 +362,7 @@
int start_reg = ai->reg;
int nregs = ai->size;
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);
@@ -378,7 +378,7 @@
int start_reg = ai->reg;
int nregs = ai->size;
if (nregs) {
- 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);
Modified: trunk/mono/mono/mini/inssel-s390.brg
===================================================================
--- trunk/mono/mono/mini/inssel-s390.brg 2008-02-06 05:37:38 UTC (rev
94994)
+++ trunk/mono/mono/mini/inssel-s390.brg 2008-02-06 07:26:03 UTC (rev
94995)
@@ -36,8 +36,8 @@
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_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);
@@ -185,7 +185,7 @@
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);
@@ -203,7 +203,7 @@
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);
@@ -223,11 +223,11 @@
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->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);
@@ -265,7 +265,7 @@
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);
@@ -307,7 +307,7 @@
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);
@@ -337,7 +337,7 @@
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);
@@ -354,7 +354,7 @@
}
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->backend.reg3;
mono_bblock_add_inst (s->cbb, tree);
@@ -512,7 +512,7 @@
//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);
Modified: trunk/mono/mono/mini/inssel-s390x.brg
===================================================================
--- trunk/mono/mono/mini/inssel-s390x.brg 2008-02-06 05:37:38 UTC (rev
94994)
+++ trunk/mono/mono/mini/inssel-s390x.brg 2008-02-06 07:26:03 UTC (rev
94995)
@@ -131,7 +131,7 @@
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 +149,7 @@
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 +186,7 @@
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 +227,7 @@
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 +257,7 @@
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 +406,7 @@
//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);
Modified: trunk/mono/mono/mini/inssel-sparc.brg
===================================================================
--- trunk/mono/mono/mini/inssel-sparc.brg 2008-02-06 05:37:38 UTC (rev
94994)
+++ trunk/mono/mono/mini/inssel-sparc.brg 2008-02-06 07:26:03 UTC (rev
94995)
@@ -325,7 +325,7 @@
stmt: OP_SPARC_OUTARG_DOUBLE_REG (freg) {
MonoCallInst *call = (MonoCallInst*)tree->inst_right->inst_left;
- tree->opcode = OP_SETFREG;
+ tree->opcode = OP_FMOVE;
tree->dreg = mono_regstate_next_int (s->rs);
tree->sreg1 = state->left->reg1;
mono_bblock_add_inst (s->cbb, tree);
Modified: trunk/mono/mono/mini/mini-alpha.c
===================================================================
--- trunk/mono/mono/mini/mini-alpha.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-alpha.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -432,7 +432,6 @@
{
case OP_MOVE:
case OP_FMOVE:
- case OP_SETREG:
/*
* Removes:
*
Modified: trunk/mono/mono/mini/mini-arm.c
===================================================================
--- trunk/mono/mono/mini/mini-arm.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-arm.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -1387,7 +1387,6 @@
case CEE_CONV_I4:
case CEE_CONV_U4:
case OP_MOVE:
- case OP_SETREG:
ins->opcode = OP_MOVE;
/*
* OP_MOVE reg, reg
@@ -2376,7 +2375,6 @@
ARM_MUL_REG_REG (code, ins->dreg, ins->sreg1,
ins->sreg2);
break;
case OP_ICONST:
- case OP_SETREGIMM:
code = mono_arm_emit_load_imm (code, ins->dreg,
ins->inst_c0);
break;
case OP_AOTCONST:
@@ -2392,7 +2390,6 @@
case CEE_CONV_I4:
case CEE_CONV_U4:
case OP_MOVE:
- case OP_SETREG:
if (ins->dreg != ins->sreg1)
ARM_MOV_REG_REG (code, ins->dreg, ins->sreg1);
break;
@@ -2408,7 +2405,6 @@
ARM_MOV_REG_REG (code, ARM_MSW_REG, saved);
break;
}
- case OP_SETFREG:
case OP_FMOVE:
#ifdef ARM_FPU_FPA
ARM_MVFD (code, ins->dreg, ins->sreg1);
@@ -3624,7 +3620,7 @@
/* add the this argument */
if (this_reg != -1) {
MonoInst *this;
- MONO_INST_NEW (cfg, this, OP_SETREG);
+ MONO_INST_NEW (cfg, this, OP_MOVE);
this->type = this_type;
this->sreg1 = this_reg;
this->dreg = mono_regstate_next_int (cfg->rs);
@@ -3634,7 +3630,7 @@
if (vt_reg != -1) {
MonoInst *vtarg;
- MONO_INST_NEW (cfg, vtarg, OP_SETREG);
+ MONO_INST_NEW (cfg, vtarg, OP_MOVE);
vtarg->type = STACK_MP;
vtarg->sreg1 = vt_reg;
vtarg->dreg = mono_regstate_next_int (cfg->rs);
Modified: trunk/mono/mono/mini/mini-codegen.c
===================================================================
--- trunk/mono/mono/mini/mini-codegen.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-codegen.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -1496,7 +1496,7 @@
spill = -val -1;
}
- if (((ins->opcode == OP_MOVE) ||
(ins->opcode == OP_SETREG)) && !spill && !fp && (is_local_ireg (ins->dreg) &&
(rs->ifree_mask & (regmask (ins->dreg))))) {
+ if ((ins->opcode == OP_MOVE) && !spill
&& !fp && (is_local_ireg (ins->dreg) && (rs->ifree_mask & (regmask
(ins->dreg))))) {
/*
* Allocate the same hreg to
sreg1 as well so the
* peephole can get rid of the
move.
Modified: trunk/mono/mono/mini/mini-hppa.c
===================================================================
--- trunk/mono/mono/mini/mini-hppa.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-hppa.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -1324,7 +1324,6 @@
case CEE_CONV_I4:
case CEE_CONV_U4:
case OP_MOVE:
- case OP_SETREG:
if (ins->sreg1 != ins->dreg)
hppa_copy (code, ins->sreg1, ins->dreg);
break;
@@ -1539,7 +1538,6 @@
g_warning ("unimplemented opcode %s in %s()\n",
mono_inst_name (ins->opcode), __FUNCTION__);
NOT_IMPLEMENTED;
break;
- case OP_SETFREG:
case OP_FMOVE:
if (ins->sreg1 != ins->dreg)
hppa_fcpy (code, HPPA_FP_FMT_DBL, ins->sreg1,
ins->dreg);
@@ -2847,7 +2845,7 @@
/* add the this argument */
if (this_reg != -1) {
MonoInst *this;
- MONO_INST_NEW (cfg, this, OP_SETREG);
+ MONO_INST_NEW (cfg, this, OP_MOVE);
this->type = this_type;
this->sreg1 = this_reg;
this->dreg = mono_regstate_next_int (cfg->rs);
@@ -2857,7 +2855,7 @@
if (vt_reg != -1) {
MonoInst *vtarg;
- MONO_INST_NEW (cfg, vtarg, OP_SETREG);
+ MONO_INST_NEW (cfg, vtarg, OP_MOVE);
vtarg->type = STACK_MP;
vtarg->sreg1 = vt_reg;
vtarg->dreg = mono_regstate_next_int (cfg->rs);
Modified: trunk/mono/mono/mini/mini-mips.c
===================================================================
--- trunk/mono/mono/mini/mini-mips.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-mips.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -1378,7 +1378,6 @@
case CEE_CONV_I4:
case CEE_CONV_U4:
case OP_MOVE:
- case OP_SETREG:
ins->opcode = OP_MOVE;
/*
* OP_MOVE reg, reg
@@ -2173,7 +2172,6 @@
/* XXX - Throw exception if we overflowed */
break;
case OP_ICONST:
- case OP_SETREGIMM:
mips_load_const (code, ins->dreg, ins->inst_c0);
break;
case OP_AOTCONST:
@@ -2197,7 +2195,6 @@
case CEE_CONV_I4:
case CEE_CONV_U4:
case OP_MOVE:
- case OP_SETREG:
if (ins->dreg != ins->sreg1)
mips_move (code, ins->dreg, ins->sreg1);
break;
@@ -2218,11 +2215,6 @@
mips_move (code, mips_v1, ins->sreg1);
}
break;
- case OP_SETFREG:
- if (ins->dreg != ins->sreg1) {
- mips_fmovd (code, ins->dreg, ins->sreg1);
- }
- break;
case OP_FMOVE:
if (ins->dreg != ins->sreg1) {
mips_fmovd (code, ins->dreg, ins->sreg1);
@@ -3884,7 +3876,7 @@
/* add the this argument */
if (this_reg != -1) {
MonoInst *this;
- MONO_INST_NEW (cfg, this, OP_SETREG);
+ MONO_INST_NEW (cfg, this, OP_MOVE);
this->type = this_type;
this->sreg1 = this_reg;
this->dreg = mono_regstate_next_int (cfg->rs);
@@ -3894,7 +3886,7 @@
if (vt_reg != -1) {
MonoInst *vtarg;
- MONO_INST_NEW (cfg, vtarg, OP_SETREG);
+ MONO_INST_NEW (cfg, vtarg, OP_MOVE);
vtarg->type = STACK_MP;
vtarg->sreg1 = vt_reg;
vtarg->dreg = mono_regstate_next_int (cfg->rs);
Modified: trunk/mono/mono/mini/mini-ops.h
===================================================================
--- trunk/mono/mono/mini/mini-ops.h 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-ops.h 2008-02-06 07:26:03 UTC (rev 94995)
@@ -29,9 +29,6 @@
MINI_OP(OP_SETRET, "setret")
MINI_OP(OP_SETFRET, "setfret")
MINI_OP(OP_SETLRET, "setlret")
-MINI_OP(OP_SETREG, "setreg")
-MINI_OP(OP_SETREGIMM, "setregimm")
-MINI_OP(OP_SETFREG, "setfreg")
MINI_OP(OP_CHECK_THIS, "checkthis")
MINI_OP(OP_VOIDCALL, "voidcall")
MINI_OP(OP_VOIDCALLVIRT, "voidcallvirt")
Modified: trunk/mono/mono/mini/mini-ppc.c
===================================================================
--- trunk/mono/mono/mini/mini-ppc.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-ppc.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -1529,7 +1529,6 @@
case CEE_CONV_I4:
case CEE_CONV_U4:
case OP_MOVE:
- case OP_SETREG:
ins->opcode = OP_MOVE;
/*
* OP_MOVE reg, reg
@@ -2524,7 +2523,6 @@
ppc_mullw (code, ins->dreg, ins->sreg1, ins->sreg2);
break;
case OP_ICONST:
- case OP_SETREGIMM:
ppc_load (code, ins->dreg, ins->inst_c0);
break;
case OP_AOTCONST:
@@ -2535,7 +2533,6 @@
case CEE_CONV_I4:
case CEE_CONV_U4:
case OP_MOVE:
- case OP_SETREG:
ppc_mr (code, ins->dreg, ins->sreg1);
break;
case OP_SETLRET: {
@@ -2550,7 +2547,6 @@
ppc_mr (code, ppc_r4, saved);
break;
}
- case OP_SETFREG:
case OP_FMOVE:
ppc_fmr (code, ins->dreg, ins->sreg1);
break;
@@ -3885,7 +3881,7 @@
/* add the this argument */
if (this_reg != -1) {
MonoInst *this;
- MONO_INST_NEW (cfg, this, OP_SETREG);
+ MONO_INST_NEW (cfg, this, OP_MOVE);
this->type = this_type;
this->sreg1 = this_reg;
this->dreg = mono_regstate_next_int (cfg->rs);
@@ -3895,7 +3891,7 @@
if (vt_reg != -1) {
MonoInst *vtarg;
- MONO_INST_NEW (cfg, vtarg, OP_SETREG);
+ MONO_INST_NEW (cfg, vtarg, OP_MOVE);
vtarg->type = STACK_MP;
vtarg->sreg1 = vt_reg;
vtarg->dreg = mono_regstate_next_int (cfg->rs);
Modified: trunk/mono/mono/mini/mini-s390.c
===================================================================
--- trunk/mono/mono/mini/mini-s390.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-s390.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -3274,8 +3274,7 @@
s390_st (code, s390_r1, 0, ins->dreg, 4);
}
break;
- case OP_ICONST:
- case OP_SETREGIMM: {
+ case OP_ICONST: {
if (s390_is_imm16(ins->inst_c0)) {
s390_lhi (code, ins->dreg, ins->inst_c0);
} else {
@@ -3297,8 +3296,7 @@
break;
case CEE_CONV_I4:
case CEE_CONV_U4:
- case OP_MOVE:
- case OP_SETREG: {
+ case OP_MOVE: {
if (ins->dreg != ins->sreg1) {
s390_lr (code, ins->dreg, ins->sreg1);
}
@@ -3316,7 +3314,6 @@
s390_lr (code, s390_r3, saved);
break;
}
- case OP_SETFREG:
case OP_FMOVE: {
if (ins->dreg != ins->sreg1) {
s390_ldr (code, ins->dreg, ins->sreg1);
@@ -4752,7 +4749,7 @@
/* add the this argument */
if (this_reg != -1) {
MonoInst *this;
- MONO_INST_NEW (cfg, this, OP_SETREG);
+ MONO_INST_NEW (cfg, this, OP_MOVE);
this->type = this_type;
this->sreg1 = this_reg;
this->dreg = mono_regstate_next_int (cfg->rs);
@@ -4762,7 +4759,7 @@
if (vt_reg != -1) {
MonoInst *vtarg;
- MONO_INST_NEW (cfg, vtarg, OP_SETREG);
+ MONO_INST_NEW (cfg, vtarg, OP_MOVE);
vtarg->type = STACK_MP;
vtarg->sreg1 = vt_reg;
vtarg->dreg = mono_regstate_next_int (cfg->rs);
Modified: trunk/mono/mono/mini/mini-s390x.c
===================================================================
--- trunk/mono/mono/mini/mini-s390x.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-s390x.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -3424,8 +3424,7 @@
}
break;
case OP_ICONST:
- case OP_I8CONST:
- case OP_SETREGIMM: {
+ case OP_I8CONST: {
if (s390_is_imm16(ins->inst_c0)) {
s390_lghi (code, ins->dreg, ins->inst_c0);
} else {
@@ -3446,7 +3445,6 @@
}
break;
case OP_MOVE:
- case OP_SETREG:
if (ins->dreg != ins->sreg1) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
@@ -3484,7 +3482,6 @@
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_LT,
"OverflowException");
s390_lgfr (code, ins->dreg, ins->sreg1);
break;
- case OP_SETFREG:
case OP_FMOVE: {
if (ins->dreg != ins->sreg1) {
s390_ldr (code, ins->dreg, ins->sreg1);
@@ -4926,7 +4923,7 @@
/* add the this argument */
if (this_reg != -1) {
MonoInst *this;
- MONO_INST_NEW (cfg, this, OP_SETREG);
+ MONO_INST_NEW (cfg, this, OP_MOVE);
this->type = this_type;
this->sreg1 = this_reg;
this->dreg = mono_regstate_next_int (cfg->rs);
@@ -4936,7 +4933,7 @@
if (vt_reg != -1) {
MonoInst *vtarg;
- MONO_INST_NEW (cfg, vtarg, OP_SETREG);
+ MONO_INST_NEW (cfg, vtarg, OP_MOVE);
vtarg->type = STACK_MP;
vtarg->sreg1 = vt_reg;
vtarg->dreg = mono_regstate_next_int (cfg->rs);
Modified: trunk/mono/mono/mini/mini-sparc.c
===================================================================
--- trunk/mono/mono/mini/mini-sparc.c 2008-02-06 05:37:38 UTC (rev 94994)
+++ trunk/mono/mono/mini/mini-sparc.c 2008-02-06 07:26:03 UTC (rev 94995)
@@ -2846,7 +2846,7 @@
if (ins->sreg1 != ins->dreg)
sparc_mov_reg_reg (code, ins->sreg1, ins->dreg);
break;
- case OP_SETFREG:
+ case OP_FMOVE:
/* Only used on V9 */
if (ins->sreg1 != ins->dreg)
sparc_fmovd (code, ins->sreg1, ins->dreg);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
