Author: zoltan
Date: 2006-11-10 12:04:15 -0500 (Fri, 10 Nov 2006)
New Revision: 67677
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-sparc.c
trunk/mono/mono/mini/tramp-sparc.c
Log:
2006-11-10 Zoltan Varga <[EMAIL PROTECTED]>
* mini-sparc.c (is_regsize_var): Support PTR/FNPTR too.
* tramp-sparc.c (mono_arch_patch_callsite): Fix this function so it
actually
works. Fixes #79852 and #79463.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2006-11-10 16:50:11 UTC (rev 67676)
+++ trunk/mono/mono/mini/ChangeLog 2006-11-10 17:04:15 UTC (rev 67677)
@@ -1,4 +1,10 @@
+2006-11-10 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini-sparc.c (is_regsize_var): Support PTR/FNPTR too.
+
+ * tramp-sparc.c (mono_arch_patch_callsite): Fix this function so it
actually
+ works. Fixes #79852 and #79463.
+
Thu Nov 9 16:56:13 CET 2006 Paolo Molaro <[EMAIL PROTECTED]>
* mini.c, mini-codegen.c, jit-icalls.c, jit-icalls.h:
Modified: trunk/mono/mono/mini/mini-sparc.c
===================================================================
--- trunk/mono/mono/mini/mini-sparc.c 2006-11-10 16:50:11 UTC (rev 67676)
+++ trunk/mono/mono/mini/mini-sparc.c 2006-11-10 17:04:15 UTC (rev 67677)
@@ -705,6 +705,8 @@
case MONO_TYPE_U4:
case MONO_TYPE_I:
case MONO_TYPE_U:
+ case MONO_TYPE_PTR:
+ case MONO_TYPE_FNPTR:
return TRUE;
case MONO_TYPE_OBJECT:
case MONO_TYPE_STRING:
Modified: trunk/mono/mono/mini/tramp-sparc.c
===================================================================
--- trunk/mono/mono/mini/tramp-sparc.c 2006-11-10 16:50:11 UTC (rev 67676)
+++ trunk/mono/mono/mini/tramp-sparc.c 2006-11-10 17:04:15 UTC (rev 67677)
@@ -60,7 +60,7 @@
void
mono_arch_patch_callsite (guint8 *code, guint8 *addr)
{
- if (sparc_inst_op (*code) == 0x1) {
+ if (sparc_inst_op (*(guint32*)code) == 0x1) {
sparc_call_simple (code, (guint8*)addr - (guint8*)code);
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches