Merge pull request #1804 from esdrubal/processmodule

[mono.git] / mono / metadata / sgen-os-win32.c

diff --git a/mono/metadata/sgen-os-win32.c b/mono/metadata/sgen-os-win32.c
index 664fc548770996ade1342cdb411b75ec0a415227..656d8393045abfc5cf3a4d49365cc6c6f13a686b 100644 (file)
--- a/mono/metadata/sgen-os-win32.c
+++ b/mono/metadata/sgen-os-win32.c
@@ -2,9 +2,9 @@
 
 #if defined(HAVE_SGEN_GC) && defined(HOST_WIN32)
 
-#include <windows.h>
+#include "io-layer/io-layer.h"
 
-#include "metadata/sgen-gc.h"
+#include "sgen/sgen-gc.h"
 #include "metadata/gc-internal.h"
 
 gboolean
@@ -57,22 +57,59 @@ sgen_suspend_thread (SgenThreadInfo *info)
 
        CloseHandle (handle);
 
-       info->stopped_ip = (gpointer)context.Eip;
-       info->stack_start = (char*)context.Esp - REDZONE_SIZE;
+#if !defined(MONO_CROSS_COMPILE)
+#ifdef USE_MONO_CTX
+       memset (&info->client_info.ctx, 0, sizeof (MonoContext));
+#ifdef TARGET_AMD64
+       info->client_info.ctx.rip = context.Rip;
+       info->client_info.ctx.rax = context.Rax;
+       info->client_info.ctx.rcx = context.Rcx;
+       info->client_info.ctx.rdx = context.Rdx;
+       info->client_info.ctx.rbx = context.Rbx;
+       info->client_info.ctx.rsp = context.Rsp;
+       info->client_info.ctx.rbp = context.Rbp;
+       info->client_info.ctx.rsi = context.Rsi;
+       info->client_info.ctx.rdi = context.Rdi;
+       info->client_info.ctx.r8 = context.R8;
+       info->client_info.ctx.r9 = context.R9;
+       info->client_info.ctx.r10 = context.R10;
+       info->client_info.ctx.r11 = context.R11;
+       info->client_info.ctx.r12 = context.R12;
+       info->client_info.ctx.r13 = context.R13;
+       info->client_info.ctx.r14 = context.R14;
+       info->client_info.ctx.r15 = context.R15;
+       info->client_info.stopped_ip = info->client_info.ctx.rip;
+       info->client_info.stack_start = (char*)info->client_info.ctx.rsp - REDZONE_SIZE;
+#else
+       info->client_info.ctx.edi = context.Edi;
+       info->client_info.ctx.esi = context.Esi;
+       info->client_info.ctx.ebx = context.Ebx;
+       info->client_info.ctx.edx = context.Edx;
+       info->client_info.ctx.ecx = context.Ecx;
+       info->client_info.ctx.eax = context.Eax;
+       info->client_info.ctx.ebp = context.Ebp;
+       info->client_info.ctx.esp = context.Esp;
+       info->client_info.stopped_ip = (gpointer)context.Eip;
+       info->client_info.stack_start = (char*)context.Esp - REDZONE_SIZE;
+#endif
 
-       info->regs [0] = context.Edi;
-       info->regs [1] = context.Esi;
-       info->regs [2] = context.Ebx;
-       info->regs [3] = context.Edx;
-       info->regs [4] = context.Ecx;
-       info->regs [5] = context.Eax;
-       info->regs [6] = context.Ebp;
-       info->regs [7] = context.Esp;
-       info->stopped_regs = &info->regs;
+#else
+       info->client_info.regs [0] = context.Edi;
+       info->client_info.regs [1] = context.Esi;
+       info->client_info.regs [2] = context.Ebx;
+       info->client_info.regs [3] = context.Edx;
+       info->client_info.regs [4] = context.Ecx;
+       info->client_info.regs [5] = context.Eax;
+       info->client_info.regs [6] = context.Ebp;
+       info->client_info.regs [7] = context.Esp;
+       info->client_info.stopped_ip = (gpointer)context.Eip;
+       info->client_info.stack_start = (char*)context.Esp - REDZONE_SIZE;
+#endif
+#endif
 
        /* Notify the JIT */
        if (mono_gc_get_gc_callbacks ()->thread_suspend_func)
-               mono_gc_get_gc_callbacks ()->thread_suspend_func (info->runtime_data, NULL);
+               mono_gc_get_gc_callbacks ()->thread_suspend_func (info->client_info.runtime_data, NULL, NULL);
 
        return TRUE;
 }
@@ -90,24 +127,17 @@ sgen_thread_handshake (BOOL suspend)
        SgenThreadInfo *current = mono_thread_info_current ();
        int count = 0;
 
+       current->client_info.suspend_done = TRUE;
        FOREACH_THREAD_SAFE (info) {
-               if (info->joined_stw == suspend)
-                       continue;
-               info->joined_stw = suspend;
                if (info == current)
                        continue;
-               if (info->gc_disabled)
+               info->client_info.suspend_done = FALSE;
+               if (info->client_info.gc_disabled)
                        continue;
                if (suspend) {
-                       g_assert (!info->doing_handshake);
-                       info->doing_handshake = TRUE;
-
                        if (!sgen_suspend_thread (info))
                                continue;
                } else {
-                       g_assert (info->doing_handshake);
-                       info->doing_handshake = FALSE;
-
                        if (!sgen_resume_thread (info))
                                continue;
                }