Author: wade
Date: 2008-01-14 13:55:36 -0500 (Mon, 14 Jan 2008)
New Revision: 92894
Modified:
branches/mono-1-2-6/mono/mono/mini/ChangeLog
branches/mono-1-2-6/mono/mono/mini/mini-sparc.c
Log:
Backport 92675 from trunk to 1.2.6 branch
Modified: branches/mono-1-2-6/mono/mono/mini/ChangeLog
===================================================================
--- branches/mono-1-2-6/mono/mono/mini/ChangeLog 2008-01-14 18:53:57 UTC
(rev 92893)
+++ branches/mono-1-2-6/mono/mono/mini/ChangeLog 2008-01-14 18:55:36 UTC
(rev 92894)
@@ -1,3 +1,11 @@
+2008-01-11 Zoltan Varga <[EMAIL PROTECTED]>
+
+ [Backport to 1.2.6]
+ * mini-sparc.c (mono_arch_output_basic_block): Use a byte load in
CHECK_THIS.
+ Fixes #353182.
+
+ * Makefile.am (version.h): Make this work with non-bash shells.
+
2007-12-29 Zoltan Varga <[EMAIL PROTECTED]>
* mini-ppc.c (mono_arch_get_delegate_invoke_impl): Fix flushing of
icache.
Modified: branches/mono-1-2-6/mono/mono/mini/mini-sparc.c
===================================================================
--- branches/mono-1-2-6/mono/mono/mini/mini-sparc.c 2008-01-14 18:53:57 UTC
(rev 92893)
+++ branches/mono-1-2-6/mono/mono/mini/mini-sparc.c 2008-01-14 18:55:36 UTC
(rev 92894)
@@ -2887,7 +2887,8 @@
break;
case OP_CHECK_THIS:
/* ensure ins->sreg1 is not NULL */
- sparc_ld_imm (code, ins->sreg1, 0, sparc_g0);
+ /* Might be misaligned in case of vtypes so use a byte
load */
+ sparc_ldsb_imm (code, ins->sreg1, 0, sparc_g0);
break;
case OP_ARGLIST:
sparc_add_imm (code, FALSE, sparc_fp, cfg->sig_cookie,
sparc_o7);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
