Merge pull request #1040 from Unity-Technologies/unity-master-sync-il2cpp

Sync changes from IL2CPP

Author: joncham

mono/arch/arm64/arm64-codegen.h

@@ -170,7 +170,7 @@ arm_is_bl_disp (void *code, void *target)
 static G_GNUC_UNUSED inline unsigned int
 arm_get_disp (void *p, void *target)
 {
-	unsigned int disp = ((char*)target - (char*)p) / 4;
+	unsigned int disp = (unsigned int)(((char*)target - (char*)p) / 4);
 
 	if (target)
 		g_assert (arm_is_bl_disp (p, target));
@@ -196,7 +196,7 @@ arm_is_disp19 (void *code, void *target)
 static G_GNUC_UNUSED inline unsigned int
 arm_get_disp19 (void *p, void *target)
 {
-	unsigned int disp = ((char*)target - (char*)p) / 4;
+	unsigned int disp = (unsigned int)(((char*)target - (char*)p) / 4);
 
 	if (target)
 		g_assert (arm_is_disp19 (p, target));
@@ -224,7 +224,7 @@ arm_get_disp19 (void *p, void *target)
 static G_GNUC_UNUSED inline unsigned int
 arm_get_disp15 (void *p, void *target)
 {
-	unsigned int disp = ((char*)target - (char*)p) / 4;
+	unsigned int disp = (unsigned int)(((char*)target - (char*)p) / 4);
 	return (disp & 0x7fff);
 }
 

mono/mini/debugger-agent.c

@@ -4178,7 +4178,11 @@ thread_startup (MonoProfiler *prof, uintptr_t tid)
 	tls = g_new0 (DebuggerTlsData, 1);
 #endif
 	MONO_GC_REGISTER_ROOT_SINGLE (tls->thread, MONO_ROOT_SOURCE_DEBUGGER, NULL, "Debugger Thread Reference");
+#ifdef RUNTIME_IL2CPP
+	il2cpp_gc_wbarrier_set_field(tls, (void**)&tls->thread, thread);
+#else
 	tls->thread = thread;
+#endif	
 	mono_native_tls_set_value (debugger_tls_id, tls);
 
 	DEBUG_PRINTF (1, "[%p] Thread started, obj=%p, tls=%p.\n", (gpointer)tid, thread, tls);
@@ -4214,10 +4218,12 @@ thread_end (MonoProfiler *prof, uintptr_t tid)
 			/* Can't remove from tid_to_thread, as that would defeat the check in thread_start () */
 #ifndef RUNTIME_IL2CPP
 			MONO_GC_UNREGISTER_ROOT (tls->thread);
-#else
-            callbacks.il2cpp_debugger_free_thread_context(&tls->il2cpp_context);
 #endif
+#ifdef RUNTIME_IL2CPP
+			il2cpp_gc_wbarrier_set_field(tls, (void**)&tls->thread, NULL);
+#else
 			tls->thread = NULL;
+#endif			
 		}
 	}
 	mono_loader_unlock ();

mono/mini/il2cpp-compat.h

@@ -12,7 +12,9 @@
 
 #ifdef RUNTIME_IL2CPP
 
+#ifndef THREAD_STATIC_FIELD_OFFSET
 #define THREAD_STATIC_FIELD_OFFSET -1
+#endif
 
 #define VM_DOMAIN_GET_AGENT_INFO(domain) il2cpp_domain_get_agent_info(domain)
 #define VM_DOMAIN_SET_AGENT_INFO(domain, value) il2cpp_domain_set_agent_info(domain, value)

mono/sgen/sgen-gc.c

@@ -2573,7 +2573,7 @@ typedef struct {
 
 static SgenGcRequest gc_request;
 
-#include <emscripten.h>
+#include <emscripten/emscripten.h>
 
 static void
 gc_pump_callback (void)

mono/utils/mono-context.c

@@ -458,11 +458,21 @@ mono_monoctx_to_sigctx (MonoContext *mctx, void *ctx)
 
 #include <mono/utils/mono-context.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;
+    memcpy(&mctx->regs, &context->X0, sizeof(mgreg_t) * 31);
+    memcpy(&mctx->fregs, &context->V, sizeof(MonoContextSimdReg) * 32);
 #else
 	memcpy (mctx->regs, UCONTEXT_GREGS (sigctx), sizeof (mgreg_t) * 31);
 	mctx->pc = UCONTEXT_REG_PC (sigctx);
@@ -484,6 +494,12 @@ mono_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
 {
 #ifdef MONO_CROSS_COMPILE
 	g_assert_not_reached ();
+#elif defined(HOST_WIN32)
+    CONTEXT *context = (CONTEXT*)sigctx;
+
+    context->Pc = mctx->pc;
+    memcpy(&context->X0, &mctx->regs, sizeof(mgreg_t) * 31);
+    memcpy(&context->V, &mctx->fregs, sizeof(MonoContextSimdReg) * 32);
 #else
 	memcpy (UCONTEXT_GREGS (sigctx), mctx->regs, sizeof (mgreg_t) * 31);
 	UCONTEXT_REG_PC (sigctx) = mctx->pc;

mono/utils/mono-context.h

@@ -41,8 +41,13 @@ typedef struct _libc_xmmreg MonoContextSimdReg;
 typedef __m128d MonoContextSimdReg;
 #endif
 #elif defined(TARGET_ARM64)
+#if defined(HOST_WIN32)
+#include <arm64_neon.h>
+typedef __n128 MonoContextSimdReg;
+#else
 typedef __uint128_t MonoContextSimdReg;
 #endif
+#endif
 
 /*
  * General notes about mono-context.

mono/utils/mono-hwcap-web.c

@@ -0,0 +1,6 @@
+#include "mono/utils/mono-hwcap.h"
+
+void
+mono_hwcap_arch_init (void)
+{
+}

mono/utils/mono-sigcontext.h

@@ -461,7 +461,9 @@ typedef struct ucontext {
 	#define UCONTEXT_REG_R0(ctx) (((ucontext64_t*)(ctx))->uc_mcontext64->__ss.__x [ARMREG_R0])
 	#define UCONTEXT_GREGS(ctx) (&(((ucontext64_t*)(ctx))->uc_mcontext64->__ss.__x))
 #else
-#include <ucontext.h>
+# if HAVE_UCONTEXT_H
+#  include <ucontext.h>
+# endif
 	#define UCONTEXT_REG_PC(ctx) (((ucontext_t*)(ctx))->uc_mcontext.pc)
 	#define UCONTEXT_REG_SP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.sp)
 	#define UCONTEXT_REG_R0(ctx) (((ucontext_t*)(ctx))->uc_mcontext.regs [ARMREG_R0])

mono/utils/mono-threads-posix.c

@@ -32,7 +32,7 @@
 extern int tkill (pid_t tid, int signal);
 #endif
 
-#if defined(_POSIX_VERSION) && !defined (TARGET_WASM)
+#if (defined(_POSIX_VERSION) && !defined (TARGET_WASM)) || (defined(TARGET_WASM) && defined(__EMSCRIPTEN_PTHREADS__))
 
 #include <pthread.h>