Author: zoltan
Date: 2006-01-07 12:00:01 -0500 (Sat, 07 Jan 2006)
New Revision: 55190
Modified:
branches/mono-1-1-13/mono/mono/mini/ChangeLog
branches/mono-1-1-13/mono/mono/mini/inssel-long.brg
Log:
Merge from HEAD.
Modified: branches/mono-1-1-13/mono/mono/mini/ChangeLog
===================================================================
--- branches/mono-1-1-13/mono/mono/mini/ChangeLog 2006-01-07 16:53:23 UTC
(rev 55189)
+++ branches/mono-1-1-13/mono/mono/mini/ChangeLog 2006-01-07 17:00:01 UTC
(rev 55190)
@@ -1,3 +1,7 @@
+2006-01-07 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * inssel-long.brg: Fix int->long ovf conversion rules. Fixes #77172.
+
2006-01-06 Neale Ferguson <[EMAIL PROTECTED]>
* mini-s390x.c, inssel-s390x.brg, cpu-s390x.md: Fix ATOMIC_I8
operations. Provide
Modified: branches/mono-1-1-13/mono/mono/mini/inssel-long.brg
===================================================================
--- branches/mono-1-1-13/mono/mono/mini/inssel-long.brg 2006-01-07 16:53:23 UTC
(rev 55189)
+++ branches/mono-1-1-13/mono/mono/mini/inssel-long.brg 2006-01-07 17:00:01 UTC
(rev 55190)
@@ -346,14 +346,14 @@
reg: CEE_CONV_OVF_I8 (reg) {
/* Sign extend the value in the lower word into the upper word */
- MONO_EMIT_BIALU_IMM (s, tree, OP_LSHR_IMM, state->reg1,
state->left->reg1, 0);
+ MONO_EMIT_UNALU (s, tree, CEE_CONV_I8, state->reg1, state->left->reg1);
}
reg: CEE_CONV_OVF_I8_UN (reg),
reg: CEE_CONV_OVF_U8_UN (reg) {
/* an unsigned 32 bit num always fits in an (un)signed 64 bit one */
/* Clean out the upper word */
- MONO_EMIT_BIALU_IMM (s, tree, OP_ISHR_UN_IMM, state->reg1,
state->left->reg1, 0);
+ MONO_EMIT_UNALU (s, tree, CEE_CONV_U8, state->reg1, state->left->reg1);
}
reg: CEE_CONV_OVF_U8 (reg) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
