Merge pull request #637 from LogosBible/enetdown

[mono.git] / mono / mini / exceptions-amd64.c

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 212d74e0ce9c8c110d75a723d7920d1971b084e1..e5bee78641eba585aedfb69484cfa5fb62ee664b 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -746,7 +746,7 @@ mono_arch_setup_async_callback (MonoContext *ctx, void (*async_cb)(void *fun), g
        /* Allocate a stack frame below the red zone */
        sp -= 128;
        /* The stack should be unaligned */
-       if (sp % 8 == 0)
+       if ((sp % 16) == 0)
                sp -= 8;
        ctx->rsp = sp;
        ctx->rip = (guint64)async_cb;
@@ -876,6 +876,7 @@ mono_arch_handle_altstack_exception (void *sigctx, gpointer fault_addr, gboolean
        MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (gpointer)UCONTEXT_REG_RIP (sigctx), NULL);
        gpointer *sp;
        int frame_size;
+       ucontext_t *copied_ctx;
 
        if (stack_ovf)
                exc = mono_domain_get ()->stack_overflow_ex;
@@ -891,18 +892,30 @@ mono_arch_handle_altstack_exception (void *sigctx, gpointer fault_addr, gboolean
         * 128 is the size of the red zone
         */
        frame_size = sizeof (ucontext_t) + sizeof (gpointer) * 4 + 128;
+#ifdef __APPLE__
+       frame_size += sizeof (*ctx->uc_mcontext);
+#endif
        frame_size += 15;
        frame_size &= ~15;
        sp = (gpointer)(UCONTEXT_REG_RSP (sigctx) & ~15);
        sp = (gpointer)((char*)sp - frame_size);
+       copied_ctx = (ucontext_t*)(sp + 4);
        /* the arguments must be aligned */
        sp [-1] = (gpointer)UCONTEXT_REG_RIP (sigctx);
        /* may need to adjust pointers in the new struct copy, depending on the OS */
-       memcpy (sp + 4, ctx, sizeof (ucontext_t));
+       memcpy (copied_ctx, ctx, sizeof (ucontext_t));
+#ifdef __APPLE__
+       {
+               guint8 * copied_mcontext = (guint8*)copied_ctx + sizeof (ucontext_t);
+               /* uc_mcontext is a pointer, so make a copy which is stored after the ctx */
+               memcpy (copied_mcontext, ctx->uc_mcontext, sizeof (*ctx->uc_mcontext));
+               copied_ctx->uc_mcontext = (void*)copied_mcontext;
+       }
+#endif
        /* at the return form the signal handler execution starts in altstack_handle_and_restore() */
        UCONTEXT_REG_RIP (sigctx) = (unsigned long)altstack_handle_and_restore;
        UCONTEXT_REG_RSP (sigctx) = (unsigned long)(sp - 1);
-       UCONTEXT_REG_RDI (sigctx) = (unsigned long)(sp + 4);
+       UCONTEXT_REG_RDI (sigctx) = (unsigned long)(copied_ctx);
        UCONTEXT_REG_RSI (sigctx) = (guint64)exc;
        UCONTEXT_REG_RDX (sigctx) = stack_ovf;
 #endif