Author: zoltan
Date: 2007-08-08 13:35:36 -0400 (Wed, 08 Aug 2007)
New Revision: 83683
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-amd64.h
trunk/mono/mono/mini/mini-exceptions.c
Log:
2007-08-08 Zoltan Varga <[EMAIL PROTECTED]>
* mini-exceptions.c (mono_print_thread_dump): Enable this on amd64 too.
* mini-amd64.h (MONO_INIT_CONTEXT_FROM_FUNC): Fix a warning.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-08-08 17:02:06 UTC (rev 83682)
+++ trunk/mono/mono/mini/ChangeLog 2007-08-08 17:35:36 UTC (rev 83683)
@@ -1,3 +1,9 @@
+2007-08-08 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * mini-exceptions.c (mono_print_thread_dump): Enable this on amd64 too.
+
+ * mini-amd64.h (MONO_INIT_CONTEXT_FROM_FUNC): Fix a warning.
+
2007-08-03 Neale Ferguson <[EMAIL PROTECTED]>
* mini-s390.c (add_general): Adjust offset calculation to take into
account of rounding up
Modified: trunk/mono/mono/mini/mini-amd64.h
===================================================================
--- trunk/mono/mono/mini/mini-amd64.h 2007-08-08 17:02:06 UTC (rev 83682)
+++ trunk/mono/mono/mini/mini-amd64.h 2007-08-08 17:35:36 UTC (rev 83683)
@@ -188,7 +188,7 @@
*/
#define MONO_INIT_CONTEXT_FROM_FUNC(ctx,start_func) do { \
int tmp; \
- guint64 stackptr = &tmp; \
+ guint64 stackptr = (guint64)&tmp; \
mono_arch_flush_register_windows (); \
MONO_CONTEXT_SET_IP ((ctx), (start_func)); \
MONO_CONTEXT_SET_BP ((ctx), stackptr); \
Modified: trunk/mono/mono/mini/mini-exceptions.c
===================================================================
--- trunk/mono/mono/mini/mini-exceptions.c 2007-08-08 17:02:06 UTC (rev
83682)
+++ trunk/mono/mono/mini/mini-exceptions.c 2007-08-08 17:35:36 UTC (rev
83683)
@@ -1117,7 +1117,7 @@
mono_print_thread_dump (void *sigctx)
{
MonoThread *thread = mono_thread_current ();
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
MonoContext ctx;
#endif
char *name;
@@ -1135,7 +1135,7 @@
fprintf (stdout, " tid=0x%p this=0x%p:\n",
(gpointer)(gsize)thread->tid, thread);
/* FIXME: */
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
mono_arch_sigctx_to_monoctx (sigctx, &ctx);
mono_jit_walk_stack_from_ctx (print_stack_frame, &ctx, TRUE, stdout);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
