[mono/mono] [2 commits] c6a041ed: Disable a corlib test which hangs on windows.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/926638469eee...c54015435a31

   Commit: c6a041ed80d941ee67b02edf1e0546a1260953a4
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-11-23 19:02:49 GMT
      URL: https://github.com/mono/mono/commit/c6a041ed80d941ee67b02edf1e0546a1260953a4

Disable a corlib test which hangs on windows.

Changed paths:
  M mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs

Modified: mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
===================================================================
@@ -2201,6 +2201,8 @@ public void OpenRemoteBaseKey_MachineName_Null ()
 		}
 
 		[Test]
+		// This hangs on windows
+		[Category ("NotWorking")]
 		public void OpenRemoteBaseKey_MachineName_DoesNotExist ()
 		{
 			// access to registry of remote machines is not implemented on unix

   Commit: c54015435a31e48baa78749778163a1f62ba33b9
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-11-23 19:02:50 GMT
      URL: https://github.com/mono/mono/commit/c54015435a31e48baa78749778163a1f62ba33b9

[sgen] Add minimal mingw64 support.

Changed paths:
  M mono/metadata/sgen-os-win32.c

Modified: mono/metadata/sgen-os-win32.c
===================================================================
@@ -57,11 +57,27 @@
 
 	CloseHandle (handle);
 
-	info->stopped_ip = (gpointer)context.Eip;
-	info->stack_start = (char*)context.Esp - REDZONE_SIZE;
-
 #ifdef USE_MONO_CTX
 	memset (&info->ctx, 0, sizeof (MonoContext));
+#ifdef TARGET_AMD64
+	info->ctx.rip = context.Rip;
+	info->ctx.rax = context.Rax;
+	info->ctx.rcx = context.Rcx;
+	info->ctx.rdx = context.Rdx;
+	info->ctx.rbx = context.Rbx;
+	info->ctx.rsp = context.Rsp;
+	info->ctx.rbp = context.Rbp;
+	info->ctx.rsi = context.Rsi;
+	info->ctx.rdi = context.Rdi;
+	info->ctx.r8 = context.R8;
+	info->ctx.r9 = context.R9;
+	info->ctx.r10 = context.R10;
+	info->ctx.r11 = context.R11;
+	info->ctx.r12 = context.R12;
+	info->ctx.r13 = context.R13;
+	info->ctx.r14 = context.R14;
+	info->ctx.r15 = context.R15;
+#else
 	info->ctx.edi = context.Edi;
 	info->ctx.esi = context.Esi;
 	info->ctx.ebx = context.Ebx;
@@ -70,6 +86,10 @@
 	info->ctx.eax = context.Eax;
 	info->ctx.ebp = context.Ebp;
 	info->ctx.esp = context.Esp;
+#endif
+	info->stopped_ip = info->ctx.rip;
+	info->stack_start = (char*)info->ctx.rsp - REDZONE_SIZE;
+
 #else
 	info->regs [0] = context.Edi;
 	info->regs [1] = context.Esi;
@@ -79,6 +99,8 @@
 	info->regs [5] = context.Eax;
 	info->regs [6] = context.Ebp;
 	info->regs [7] = context.Esp;
+	info->stopped_ip = (gpointer)context.Eip;
+	info->stack_start = (char*)context.Esp - REDZONE_SIZE;
 #endif
 
 	/* Notify the JIT */


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches