Author: zoltan
Date: 2005-04-17 06:30:18 -0400 (Sun, 17 Apr 2005)
New Revision: 43141
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/aot.c
trunk/mono/mono/mini/mini-exceptions.c
Log:
2005-04-17 Zoltan Varga <[EMAIL PROTECTED]>
* aot.c (mono_compile_assembly): Fix warning.
* mini-exceptions.c (ves_icall_get_frame_info): Fix bug introduced
by the _MSC_VER stuff.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2005-04-17 10:18:27 UTC (rev 43140)
+++ trunk/mono/mono/mini/ChangeLog 2005-04-17 10:30:18 UTC (rev 43141)
@@ -1,3 +1,10 @@
+2005-04-17 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * aot.c (mono_compile_assembly): Fix warning.
+
+ * mini-exceptions.c (ves_icall_get_frame_info): Fix bug introduced
+ by the _MSC_VER stuff.
+
2005-04-16 Zoltan Varga <[EMAIL PROTECTED]>
* inssel-long.brg: Fix #74588.
Modified: trunk/mono/mono/mini/aot.c
===================================================================
--- trunk/mono/mono/mini/aot.c 2005-04-17 10:18:27 UTC (rev 43140)
+++ trunk/mono/mono/mini/aot.c 2005-04-17 10:30:18 UTC (rev 43141)
@@ -2211,7 +2211,7 @@
if (acfg->got_offset > 0)
fprintf (tmpfp, ".skip %d\n", (int)(acfg->got_offset * sizeof
(gpointer)));
- printf ("GOT SIZE: %d\n", acfg->got_offset * sizeof (gpointer));
+ printf ("GOT SIZE: %d\n", (int)(acfg->got_offset * sizeof (gpointer)));
symbol = g_strdup_printf ("got_addr");
emit_section_change (tmpfp, ".data", 1);
Modified: trunk/mono/mono/mini/mini-exceptions.c
===================================================================
--- trunk/mono/mono/mini/mini-exceptions.c 2005-04-17 10:18:27 UTC (rev
43140)
+++ trunk/mono/mono/mini/mini-exceptions.c 2005-04-17 10:30:18 UTC (rev
43141)
@@ -321,14 +321,14 @@
MonoLMF *lmf = jit_tls->lmf;
MonoJitInfo *ji, rji;
MonoContext ctx, new_ctx;
- unsigned int stackptr;
+ gssize stackptr;
mono_arch_flush_register_windows ();
#ifdef _MSC_VER
__asm mov stackptr, ebp;
#else
- stackptr = (unsigned int) __builtin_frame_address (0);
+ stackptr = (gssize)__builtin_frame_address (0);
#endif
MONO_CONTEXT_SET_IP (&ctx, ves_icall_get_frame_info);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches