Author: zoltan
Date: 2007-12-21 20:58:07 -0500 (Fri, 21 Dec 2007)
New Revision: 91801
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long.brg
branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long32.brg
branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini-ops.h
branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
branches/vargaz/mini-linear-il/mono/mono/mini/simple-mini-ops.h
Log:
2007-12-22 Zoltan Varga <[EMAIL PROTECTED]>
* method-to-ir.c (mono_decompose_long_opts): Fix a typo.
* mini.c mini-ops.h inssel-long.brg inssel-long32.brg simple-mini-ops.h:
Rename OP_LONG_SHRUN_32 to OP_LSHR_UN_32 for consistency.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-12-22
00:22:45 UTC (rev 91800)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-12-22
01:58:07 UTC (rev 91801)
@@ -1,3 +1,10 @@
+2007-12-22 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * method-to-ir.c (mono_decompose_long_opts): Fix a typo.
+
+ * mini.c mini-ops.h inssel-long.brg inssel-long32.brg simple-mini-ops.h:
+ Rename OP_LONG_SHRUN_32 to OP_LSHR_UN_32 for consistency.
+
2007-12-20 Zoltan Varga <[EMAIL PROTECTED]>
* mini-amd64.c: Use OP_FMOVE instead of OP_AMD64_SET_XMMREG_R8 if
possible.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long.brg
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long.brg
2007-12-22 00:22:45 UTC (rev 91800)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long.brg
2007-12-22 01:58:07 UTC (rev 91801)
@@ -111,7 +111,7 @@
MONO_EMIT_NEW_COND_EXC (s, C, "OverflowException");
}
-reg: OP_LONG_SHRUN_32 (reg) {
+reg: OP_LSHR_UN_32 (reg) {
MONO_EMIT_BIALU_IMM (s, tree, OP_LSHR_UN_IMM, state->reg1,
state->left->reg1, 32);
}
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long32.brg
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long32.brg
2007-12-22 00:22:45 UTC (rev 91800)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/inssel-long32.brg
2007-12-22 01:58:07 UTC (rev 91801)
@@ -260,27 +260,27 @@
MONO_EMIT_NEW_BIALU (s, tree->opcode, state->reg1, state->left->reg1,
state->right->reg1);
}
-lreg: OP_LONG_SHRUN_32 (lreg) {
+lreg: OP_LSHR_UN_32 (lreg) {
/* just move the upper half to the lower and zero the high word */
MONO_EMIT_NEW_UNALU (s, OP_MOVE, state->reg1, state->left->reg2);
MONO_EMIT_NEW_ICONST (s, state->reg2, 0);
}
-reg: OP_LCONV_TO_I4 (OP_LONG_SHRUN_32 (lreg)),
-reg: OP_LCONV_TO_U4 (OP_LONG_SHRUN_32 (lreg)) {
+reg: OP_LCONV_TO_I4 (OP_LSHR_UN_32 (lreg)),
+reg: OP_LCONV_TO_U4 (OP_LSHR_UN_32 (lreg)) {
MONO_EMIT_NEW_UNALU (s, OP_MOVE, state->reg1, state->left->left->reg2);
}
-lreg: OP_LONG_SHRUN_32 (CEE_LDIND_I8 (base)) {
+lreg: OP_LSHR_UN_32 (CEE_LDIND_I8 (base)) {
/* just move the upper half to the lower and zero the high word */
MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, state->reg1,
state->left->left->tree->inst_basereg,
state->left->left->tree->inst_offset + MINI_MS_WORD_OFFSET);
MONO_EMIT_NEW_ICONST (s, state->reg2, 0);
}
-reg: OP_LCONV_TO_I4 (OP_LONG_SHRUN_32 (CEE_LDIND_I8 (base))),
-reg: OP_LCONV_TO_U4 (OP_LONG_SHRUN_32 (CEE_LDIND_I8 (base))) {
+reg: OP_LCONV_TO_I4 (OP_LSHR_UN_32 (CEE_LDIND_I8 (base))),
+reg: OP_LCONV_TO_U4 (OP_LSHR_UN_32 (CEE_LDIND_I8 (base))) {
/* just move the upper half to the lower and zero the high word */
MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, state->reg1,
state->left->left->left->tree->inst_basereg,
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-12-22 00:22:45 UTC (rev 91800)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-12-22 01:58:07 UTC (rev 91801)
@@ -5571,7 +5571,7 @@
* later apply the speedup to the left
shift as well
* See BUG# 57957.
*/
- /* FIXME: Move this to the strenght
reduction pass */
+ /* FIXME: Move this to the strength
reduction pass */
/* just move the upper half to the
lower and zero the high word */
MONO_EMIT_NEW_UNALU (cfg, OP_MOVE,
tree->dreg + 1, tree->sreg1 + 2);
MONO_EMIT_NEW_ICONST (cfg, tree->dreg +
2, 0);
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-ops.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-ops.h 2007-12-22
00:22:45 UTC (rev 91800)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-ops.h 2007-12-22
01:58:07 UTC (rev 91801)
@@ -299,7 +299,7 @@
MINI_OP(OP_LBLE_UN, "long_ble_un", NONE, NONE, NONE)
MINI_OP(OP_LBLT_UN, "long_blt_un", NONE, NONE, NONE)
-MINI_OP(OP_LONG_SHRUN_32, "long_shr_un_32", NONE, NONE, NONE)
+MINI_OP(OP_LSHR_UN_32, "long_shr_un_32", NONE, NONE, NONE)
/* Variants of the original opcodes which take the two parts of the long as
two arguments */
MINI_OP(OP_LCONV_TO_R8_2,"long_conv_to_r8_2", FREG, IREG, IREG)
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2007-12-22
00:22:45 UTC (rev 91800)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2007-12-22
01:58:07 UTC (rev 91801)
@@ -6263,7 +6263,7 @@
*/
if ((ins->opcode == OP_LSHR_UN) && (ins->type ==
STACK_I8)
&& (ins->inst_right->opcode ==
OP_ICONST) && (ins->inst_right->inst_c0 == 32)) {
- ins->opcode = OP_LONG_SHRUN_32;
+ ins->opcode = OP_LSHR_UN_32;
/*g_print ("applied long shr speedup to %s\n",
cfg->method->name);*/
ip++;
break;
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/simple-mini-ops.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/simple-mini-ops.h
2007-12-22 00:22:45 UTC (rev 91800)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/simple-mini-ops.h
2007-12-22 01:58:07 UTC (rev 91801)
@@ -167,7 +167,7 @@
MINI_OP(OP_INEG, "int_neg")
MINI_OP(OP_INOT, "int_not")
-MINI_OP(OP_LONG_SHRUN_32, "long_shr_un_32")
+MINI_OP(OP_LSHR_UN_32, "long_shr_un_32")
MINI_OP(OP_FADD, "float_add")
MINI_OP(OP_FSUB, "float_sub")
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
