Merge pull request #1949 from lewurm/fixtype

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

diff --git a/mono/metadata/sgen-os-win32.c b/mono/metadata/sgen-os-win32.c
old mode 100755 (executable)
new mode 100644 (file)
index cf3ba9d..3145a5e
--- a/mono/metadata/sgen-os-win32.c
+++ b/mono/metadata/sgen-os-win32.c
@@ -4,7 +4,7 @@
 
 #include "io-layer/io-layer.h"
 
-#include "metadata/sgen-gc.h"
+#include "sgen/sgen-gc.h"
 #include "metadata/gc-internal.h"
 
 gboolean
@@ -57,33 +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->ctx, 0, sizeof (MonoContext));
-       info->ctx.edi = context.Edi;
-       info->ctx.esi = context.Esi;
-       info->ctx.ebx = context.Ebx;
-       info->ctx.edx = context.Edx;
-       info->ctx.ecx = context.Ecx;
-       info->ctx.eax = context.Eax;
-       info->ctx.ebp = context.Ebp;
-       info->ctx.esp = context.Esp;
+       memset (&info->client_info.ctx, 0, sizeof (MonoContext));
+#ifdef TARGET_AMD64
+    info->client_info.ctx.gregs[AMD64_RIP] = context.Rip;
+    info->client_info.ctx.gregs[AMD64_RAX] = context.Rax;
+    info->client_info.ctx.gregs[AMD64_RCX] = context.Rcx;
+    info->client_info.ctx.gregs[AMD64_RDX] = context.Rdx;
+    info->client_info.ctx.gregs[AMD64_RBX] = context.Rbx;
+    info->client_info.ctx.gregs[AMD64_RSP] = context.Rsp;
+    info->client_info.ctx.gregs[AMD64_RBP] = context.Rbp;
+    info->client_info.ctx.gregs[AMD64_RSI] = context.Rsi;
+    info->client_info.ctx.gregs[AMD64_RDI] = context.Rdi;
+    info->client_info.ctx.gregs[AMD64_R8] = context.R8;
+    info->client_info.ctx.gregs[AMD64_R9] = context.R9;
+    info->client_info.ctx.gregs[AMD64_R10] = context.R10;
+    info->client_info.ctx.gregs[AMD64_R11] = context.R11;
+    info->client_info.ctx.gregs[AMD64_R12] = context.R12;
+    info->client_info.ctx.gregs[AMD64_R13] = context.R13;
+    info->client_info.ctx.gregs[AMD64_R14] = context.R14;
+    info->client_info.ctx.gregs[AMD64_R15] = context.R15;
+    info->client_info.stopped_ip = info->client_info.ctx.gregs[AMD64_RIP];
+    info->client_info.stack_start = (char*)info->client_info.ctx.gregs[AMD64_RSP] - REDZONE_SIZE;
 #else
-       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->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
+
+#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, NULL);
+               mono_gc_get_gc_callbacks ()->thread_suspend_func (info->client_info.runtime_data, NULL, NULL);
 
        return TRUE;
 }
@@ -101,10 +127,12 @@ 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 == current)
                        continue;
-               if (info->gc_disabled)
+               info->client_info.suspend_done = FALSE;
+               if (info->client_info.gc_disabled)
                        continue;
                if (suspend) {
                        if (!sgen_suspend_thread (info))