Author: zoltan
Date: 2005-06-12 18:18:36 -0400 (Sun, 12 Jun 2005)
New Revision: 45838
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/exceptions-ia64.c
trunk/mono/mono/mini/mini-ia64.h
Log:
2005-06-13 Zoltan Varga <[EMAIL PROTECTED]>
* exceptions-ia64.c mini-ia64.h: Modify ip during exception handling
so it points into the faulting instruction.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2005-06-12 21:33:52 UTC (rev 45837)
+++ trunk/mono/mono/mini/ChangeLog 2005-06-12 22:18:36 UTC (rev 45838)
@@ -1,3 +1,8 @@
+2005-06-13 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * exceptions-ia64.c mini-ia64.h: Modify ip during exception handling
+ so it points into the faulting instruction.
+
2005-06-12 Zoltan Varga <[EMAIL PROTECTED]>
* jit-icalls.c (mono_imul_ovf): Add exception handling.
Modified: trunk/mono/mono/mini/exceptions-ia64.c
===================================================================
--- trunk/mono/mono/mini/exceptions-ia64.c 2005-06-12 21:33:52 UTC (rev
45837)
+++ trunk/mono/mono/mini/exceptions-ia64.c 2005-06-12 22:18:36 UTC (rev
45838)
@@ -205,7 +205,7 @@
g_assert (res >= 0);
}
- mono_handle_exception (&ctx, exc, (gpointer)(ip + 1), FALSE);
+ mono_handle_exception (&ctx, exc, (gpointer)(ip), FALSE);
restore_context (&ctx);
g_assert_not_reached ();
Modified: trunk/mono/mono/mini/mini-ia64.h
===================================================================
--- trunk/mono/mono/mini/mini-ia64.h 2005-06-12 21:33:52 UTC (rev 45837)
+++ trunk/mono/mono/mini/mini-ia64.h 2005-06-12 22:18:36 UTC (rev 45838)
@@ -80,7 +80,8 @@
err = unw_get_reg (&ctx->cursor, UNW_IA64_IP, &ip);
g_assert (err == 0);
- return ip;
+ /* Subtrack 1 so ip points into the actual instruction */
+ return ip - 1;
}
static inline unw_word_t
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
