Merge pull request #856 from Unity-Technologies/fix-uwp-and-xbox-one-build-for-debugger

TautvydasZilys · web-flow · commit 74d2477d073f · 2018-02-24T09:50:23.000-08:00
Fix Mono so libil2cpp with debugger compiles on UWP and Xbox One
diff --git a/mono/eglib/glib.h b/mono/eglib/glib.h
@@ -889,7 +889,11 @@ gboolean   g_file_test (const gchar *filename, GFileTest test);
 #define g_open open
 #define g_rename rename
 #define g_stat stat
+#ifdef G_OS_WIN32
+#define g_unlink _unlink
+#else
 #define g_unlink unlink
+#endif
 #define g_fopen fopen
 #define g_lstat lstat
 #define g_rmdir rmdir
diff --git a/mono/eglib/gpath.c b/mono/eglib/gpath.c
@@ -252,7 +252,11 @@ g_find_program_in_path (const gchar *program)
 		x = NULL;
 		probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program, NULL);
 #if !defined(NO_HAVE_ACCESS)
-		if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
+#ifdef G_OS_WIN32
+		if (_access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
+#else
+		if (access(probe_path, X_OK) == 0) {
+#endif
 			g_free (curdir);
 			g_free (p);
 			return probe_path;
@@ -268,7 +272,7 @@ g_find_program_in_path (const gchar *program)
 				program_exe = g_strjoin(NULL,program,suffix_list[listx],NULL);
 				probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program_exe, NULL);
 #if !defined(NO_HAVE_ACCESS)
-				if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
+				if (_access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
 					g_free (curdir);
 					g_free (p);
 					g_free (program_exe);
diff --git a/mono/eglib/gunicode-win32-uwp.c b/mono/eglib/gunicode-win32-uwp.c
@@ -19,9 +19,9 @@ g_get_charset (G_CONST_RETURN char **charset)
 {
 	if (my_charset == NULL) {
 		static char buf [14];
-		CPINFOEXA cp_info;
+		CPINFOEXW cp_info;
 
-		GetCPInfoExA (CP_ACP, 0, &cp_info);
+		GetCPInfoExW (CP_ACP, 0, &cp_info);
 		sprintf (buf, "CP%u", cp_info.CodePage);
 		my_charset = buf;
 		is_utf8 = FALSE;
diff --git a/mono/eglib/gunicode-win32.c b/mono/eglib/gunicode-win32.c
@@ -7,7 +7,7 @@
 #include <config.h>
 #include <glib.h>
 
-#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
+#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT)
 #define CODESET 1
 #include <windows.h>
 
@@ -30,7 +30,7 @@ g_get_charset (G_CONST_RETURN char **charset)
 	return is_utf8;
 }
 
-#else /* G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */
+#else /* G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT) */
 
 #ifdef _MSC_VER
 // Quiet Visual Studio linker warning, LNK4221, in cases when this source file intentional ends up empty.
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
@@ -1986,6 +1986,13 @@ ves_icall_System_Threading_WaitHandle_Wait_internal (gpointer *handles, gint32 n
 	return map_native_wait_result_to_managed (ret, numhandles);
 }
 
+/*
+ * UWP doesn't support SignalObjectAndWait until SDK version 15063. Our minspec currently is 10240.
+ * Since we don't care about running Mono runtime for now, let's just disable this icall and reevaluate
+ * in some months when we have to get libmono with IL2CPP up & running
+ */
+#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
+
 gint32
 ves_icall_System_Threading_WaitHandle_SignalAndWait_Internal (gpointer toSignal, gpointer toWait, gint32 ms, MonoError *error)
 {
@@ -2013,6 +2020,8 @@ ves_icall_System_Threading_WaitHandle_SignalAndWait_Internal (gpointer toSignal,
 	return map_native_wait_result_to_managed (ret, 1);
 }
 
+#endif
+
 gint32 ves_icall_System_Threading_Interlocked_Increment_Int (gint32 *location)
 {
 	return mono_atomic_inc_i32 (location);
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
@@ -636,8 +636,6 @@ typedef struct ReplyPacket {
 	Buffer *data;
 } ReplyPacket;
 
-#define DEBUG(level,s) do { if (G_UNLIKELY ((level) <= log_level)) { s; fflush (log_file); } } while (0)
-
 #ifdef HOST_ANDROID
 #define DEBUG_PRINTF(level, ...) do { if (G_UNLIKELY ((level) <= log_level)) { g_print (__VA_ARGS__); } } while (0)
 #else
@@ -1465,7 +1463,11 @@ socket_transport_connect (const char *address)
 				break;       /* Success */
 			
 			MONO_ENTER_GC_SAFE;
+#ifdef HOST_WIN32
+			closesocket (sfd);
+#else
 			close (sfd);
+#endif
 			MONO_EXIT_GC_SAFE;
 		}
 
diff --git a/mono/mini/il2cpp-compat.h b/mono/mini/il2cpp-compat.h
@@ -239,6 +239,7 @@
 #define mono_method_get_class il2cpp_method_get_class
 #define mono_class_get_image il2cpp_class_get_image
 #define mono_class_get_interfaces il2cpp_class_get_interfaces
+#undef MONO_CLASS_IS_INTERFACE
 #define MONO_CLASS_IS_INTERFACE il2cpp_class_is_interface
 #define mono_image_get_assembly il2cpp_image_get_assembly
 #define mono_image_get_name il2cpp_image_get_name
@@ -252,10 +253,13 @@
 #define mono_method_get_token il2cpp_method_get_token
 #define mono_method_is_generic il2cpp_method_is_generic
 #define mono_method_is_inflated il2cpp_method_is_inflated
+#undef mono_field_is_deleted
 #define mono_field_is_deleted il2cpp_field_is_deleted
 #define mono_domain_get_assemblies_iter il2cpp_domain_get_assemblies_iter
 
+#undef mono_domain_assemblies_lock
 #define mono_domain_assemblies_lock
+#undef mono_domain_assemblies_unlock
 #define mono_domain_assemblies_unlock
 
 #define mono_get_string_class il2cpp_mono_get_string_class
diff --git a/mono/utils/atomic.h b/mono/utils/atomic.h
@@ -167,7 +167,7 @@ static inline void
 mono_atomic_store_i8 (volatile gint8 *dst, gint8 val)
 {
 #if (_MSC_VER >= 1600)
-	InterlockedExchange8 ((CHAR volatile *)dst, (CHAR)val);
+	_InterlockedExchange8 ((CHAR volatile *)dst, (CHAR)val);
 #else
 	*dst = val;
 	mono_memory_barrier ();
diff --git a/mono/utils/dlmalloc.c b/mono/utils/dlmalloc.c
@@ -461,7 +461,9 @@ DEFAULT_MMAP_THRESHOLD       default: 256K
 #endif  /* _WIN32 */
 #endif  /* WIN32 */
 #ifdef WIN32
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #define HAVE_MMAP 1
 #define HAVE_MORECORE 0
diff --git a/mono/utils/mono-context.c b/mono/utils/mono-context.c
@@ -395,11 +395,24 @@ mono_monoctx_to_sigctx (MonoContext *mctx, void *ctx)
 #include <mono/arch/arm/arm-codegen.h>
 #include <mono/arch/arm/arm-vfp-codegen.h>
 
+#ifdef HOST_WIN32
+#include <windows.h>
+#endif
+
 void
 mono_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
 {
 #ifdef MONO_CROSS_COMPILE
 	g_assert_not_reached ();
+#elif defined(HOST_WIN32)
+	CONTEXT *context = (CONTEXT*)sigctx;
+
+	mctx->pc = context->Pc;
+	mctx->cpsr = context->Cpsr;
+	memcpy (&mctx->regs, &context->R0, sizeof (DWORD) * 16);
+	
+	/* Why are we only copying 16 registers?! There are 32! */
+	memcpy (&mctx->fregs, &context->D, sizeof (double) * 16);
 #else
 	arm_ucontext *my_uc = sigctx;
 
@@ -418,6 +431,15 @@ mono_monoctx_to_sigctx (MonoContext *mctx, void *ctx)
 {
 #ifdef MONO_CROSS_COMPILE
 	g_assert_not_reached ();
+#elif defined(HOST_WIN32)
+	CONTEXT *context = (CONTEXT*)ctx;
+
+	context->Pc = mctx->pc;
+	context->Cpsr = mctx->cpsr;
+	memcpy (&context->R0, &mctx->regs, sizeof (DWORD) * 16);
+	
+	/* Why are we only copying 16 registers?! There are 32! */
+	memcpy (&context->D, &mctx->fregs, sizeof (double) * 16);
 #else
 	arm_ucontext *my_uc = ctx;
 
diff --git a/mono/utils/mono-dl-windows-uwp.c b/mono/utils/mono-dl-windows-uwp.c
@@ -9,7 +9,7 @@
 #include <glib.h>
 #include "mono/utils/mono-compiler.h"
 
-#if G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT)
+#if G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT)
 #include <windows.h>
 #include "mono/utils/mono-dl-windows-internals.h"
 
@@ -37,7 +37,7 @@ mono_dl_current_error_string (void)
 	return ret;
 }
 
-#else /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT) */
+#else /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT) */
 
 MONO_EMPTY_SOURCE_FILE (mono_dl_windows_uwp);
-#endif /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT) */
+#endif /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT) */
diff --git a/mono/utils/mono-dl-windows.c b/mono/utils/mono-dl-windows.c
@@ -55,7 +55,11 @@ mono_dl_open_file (const char *file, int flags)
 #endif
 		guint32 last_error = 0;
 
+#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT)
 		hModule = LoadLibrary (file_utf16);
+#else
+		hModule = LoadPackagedLibrary (file_utf16, NULL);
+#endif
 		if (!hModule)
 			last_error = GetLastError ();
 
@@ -68,7 +72,11 @@ mono_dl_open_file (const char *file, int flags)
 		if (!hModule)
 			SetLastError (last_error);
 	} else {
+#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
 		hModule = GetModuleHandle (NULL);
+#else
+		g_assert(0 && "Not supported");
+#endif
 	}
 	return hModule;
 }
diff --git a/mono/utils/mono-filemap.c b/mono/utils/mono-filemap.c
@@ -80,7 +80,7 @@ mono_file_map_fd (MonoFileMap *fmap)
 {
 	if (file_fd_func) return file_fd_func(fmap);
 #ifdef WIN32
-	return fileno ((FILE*)fmap);
+	return _fileno ((FILE*)fmap);
 #else
 	return (int)(size_t)fmap;
 #endif
diff --git a/mono/utils/mono-hwcap-arm.c b/mono/utils/mono-hwcap-arm.c
@@ -94,6 +94,31 @@ mono_hwcap_arch_init (void)
 	}
 
 	/* TODO: Find a way to detect features like Thumb and VFP. */
+#elif defined (_WIN32)
+    /* From MSDN:	
+     * Windows on ARM presumes that it is running on an ARMv7 architecture at all times. 
+     * Floating-point support in the form of VFPv3-D32 or later must be present in hardware.
+     * The VFP must support both single-precision and double-precision floating-point in hardware. 
+     *
+     * The Windows runtime does not support emulation of floating-point to enable running on non-VFP hardware.
+     * Advanced SIMD Extensions (NEON) support—this includes both integer and floating-point operations—must also be present in hardware. 
+     * No run-time support for emulation is provided.
+     *
+     * Integer divide support (UDIV/SDIV) is strongly recommended but not required.
+     * Platforms that lack integer divide support may incur a performance penalty because
+     * these operations have to be trapped and possibly patched.
+	 *
+     * The instruction set for Windows on ARM is strictly limited to Thumb-2. 
+     * All code executed on this platform is expected to start and remain in Thumb mode at all times. 
+     */
+    mono_hwcap_arm_is_v5 = TRUE;
+    mono_hwcap_arm_is_v6 = TRUE;
+    mono_hwcap_arm_is_v7 = TRUE;
+    mono_hwcap_arm_has_vfp = TRUE;
+    mono_hwcap_arm_has_vfp3 = TRUE;
+    mono_hwcap_arm_has_vfp3_d16 = TRUE;
+    mono_hwcap_arm_has_thumb = TRUE;
+    mono_hwcap_arm_has_thumb2 = TRUE;
 #else
 	/* We can't use the auxiliary vector on Android due to
 	 * permissions, so fall back to /proc/cpuinfo. We also
diff --git a/mono/utils/mono-os-wait-win32-uwp.c b/mono/utils/mono-os-wait-win32-uwp.c
@@ -9,7 +9,7 @@
 #include <glib.h>
 #include "mono/utils/mono-compiler.h"
 
-#if G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT)
+#if G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT)
 #include <windows.h>
 
 DWORD
@@ -21,7 +21,7 @@ mono_win32_msg_wait_for_multiple_objects_ex (DWORD count, CONST HANDLE *handles,
 	return WAIT_FAILED;
 }
 
-#else /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT) */
+#else /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT) */
 
 MONO_EMPTY_SOURCE_FILE (mono_os_wait_win32_uwp);
-#endif /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT) */
+#endif /* G_HAVE_API_SUPPORT(HAVE_UWP_WINAPI_SUPPORT | HAVE_XBOXONE_WINAPI_SUPPORT) */
diff --git a/mono/utils/mono-os-wait-win32.c b/mono/utils/mono-os-wait-win32.c
@@ -152,6 +152,9 @@ mono_win32_wait_for_multiple_objects_ex (DWORD count, CONST HANDLE *handles, BOO
 	return result;
 }
 
+/* See comment above ves_icall_System_Threading_WaitHandle_SignalAndWait_Internal */
+#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
+
 DWORD
 mono_win32_signal_object_and_wait (HANDLE toSignal, HANDLE toWait, DWORD timeout, BOOL alertable)
 {
@@ -173,6 +176,8 @@ mono_win32_signal_object_and_wait (HANDLE toSignal, HANDLE toWait, DWORD timeout
 	return result;
 }
 
+#endif
+
 #if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
 DWORD
 mono_win32_msg_wait_for_multiple_objects_ex (DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD wakeMask, DWORD flags)
diff --git a/mono/utils/mono-stdlib.c b/mono/utils/mono-stdlib.c
@@ -35,7 +35,12 @@ mono_mkstemp (char *templ)
 
 	len = strlen (templ);
 	do {
+#if HOST_WIN32
+		t = _mktemp (templ);
+#else
 		t = mktemp (templ);
+#endif
+
 		if (t == NULL) {
 			errno = EINVAL;
 			return -1;
@@ -45,7 +50,11 @@ mono_mkstemp (char *templ)
 			return -1;
 		}
 
-		ret = open (templ, O_RDWR | O_BINARY | O_CREAT | O_EXCL, 0600);
+#if HOST_WIN32
+		ret = _open (templ, O_RDWR | O_BINARY | O_CREAT | O_EXCL, 0600);
+#else
+		ret = open(templ, O_RDWR | O_BINARY | O_CREAT | O_EXCL, 0600);
+#endif
 		if (ret == -1) {
 			if (errno != EEXIST)
 				return -1;
diff --git a/mono/utils/mono-threads-debug.h b/mono/utils/mono-threads-debug.h
@@ -6,11 +6,19 @@
 #define __MONO_UTILS_MONO_THREADS_DEBUG_H__
 
 /* Logging - enable them below if you need specific logging for the category you need */
+#ifdef HOST_WIN32
+#define MOSTLY_ASYNC_SAFE_PRINTF(...) do { \
+	char __buff[1024];	__buff [0] = '\0'; \
+	g_snprintf (__buff, sizeof (__buff), __VA_ARGS__);	\
+	_write (1, __buff, (guint32)strlen (__buff));	\
+} while (0)
+#else
 #define MOSTLY_ASYNC_SAFE_PRINTF(...) do { \
 	char __buff[1024];	__buff [0] = '\0'; \
 	g_snprintf (__buff, sizeof (__buff), __VA_ARGS__);	\
 	write (1, __buff, (guint32)strlen (__buff));	\
 } while (0)
+#endif
 
 #if 1
 #define THREADS_DEBUG(...)
diff --git a/mono/utils/mono-threads-windows.c b/mono/utils/mono-threads-windows.c
diff --git a/mono/utils/mono-threads.h b/mono/utils/mono-threads.h
diff --git a/mono/utils/mono-tls.h b/mono/utils/mono-tls.h
diff --git a/mono/utils/w32api.h b/mono/utils/w32api.h

Original file line number	Diff line number	Diff line change
`@@ -1986,6 +1986,13 @@ ves_icall_System_Threading_WaitHandle_Wait_internal (gpointer *handles, gint32 n`
`1986`	`1986`	`return map_native_wait_result_to_managed (ret, numhandles);`
`1987`	`1987`	`}`
`1988`	`1988`
	`1989`	`+/*`
	`1990`	`+ * UWP doesn't support SignalObjectAndWait until SDK version 15063. Our minspec currently is 10240.`
	`1991`	`+ * Since we don't care about running Mono runtime for now, let's just disable this icall and reevaluate`
	`1992`	`+ * in some months when we have to get libmono with IL2CPP up & running`
	`1993`	`+ */`
	`1994`	`+#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)`
	`1995`	`+`
`1989`	`1996`	`gint32`
`1990`	`1997`	`ves_icall_System_Threading_WaitHandle_SignalAndWait_Internal (gpointer toSignal, gpointer toWait, gint32 ms, MonoError *error)`
`1991`	`1998`	`{`
`@@ -2013,6 +2020,8 @@ ves_icall_System_Threading_WaitHandle_SignalAndWait_Internal (gpointer toSignal,`
`2013`	`2020`	`return map_native_wait_result_to_managed (ret, 1);`
`2014`	`2021`	`}`
`2015`	`2022`
	`2023`	`+#endif`
	`2024`	`+`
`2016`	`2025`	`gint32 ves_icall_System_Threading_Interlocked_Increment_Int (gint32 *location)`
`2017`	`2026`	`{`
`2018`	`2027`	`return mono_atomic_inc_i32 (location);`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ static inline void`
`167`	`167`	`mono_atomic_store_i8 (volatile gint8 *dst, gint8 val)`
`168`	`168`	`{`
`169`	`169`	`#if (_MSC_VER >= 1600)`
`170`		`- InterlockedExchange8 ((CHAR volatile *)dst, (CHAR)val);`
	`170`	`+ _InterlockedExchange8 ((CHAR volatile *)dst, (CHAR)val);`
`171`	`171`	`#else`
`172`	`172`	`*dst = val;`
`173`	`173`	`mono_memory_barrier ();`