Sync il2cpp revision 2e4b359d645856654955f175c11bdfc733005222

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/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-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])