Fixes for issues found in the PR review.

Author: TautvydasZilys

mono/mini/mini-arm64.h

@@ -164,10 +164,69 @@ typedef struct {
 
 #endif
 
-#if defined(TARGET_IOS) || defined(TARGET_APPLETV) || defined(TARGET_OSX)
+#if defined(TARGET_APPLETVOS) || defined(TARGET_IOS) || defined(TARGET_OSX)
 #define MONO_ARCH_HAVE_UNWIND_BACKTRACE 1
 #endif
 
+#if defined(TARGET_OSX)
+
+typedef enum {
+    JPM_NONE,
+    JPM_ENABLED,
+    JPM_DISABLED,
+} jit_protect_mode;
+
+extern __thread jit_protect_mode arm_current_jit_protect_mode;
+
+static void mono_arm_jit_write_protect_enable()
+{
+    if (__builtin_available(macOS 11, *)) {
+        if (arm_current_jit_protect_mode != JPM_ENABLED) {
+            pthread_jit_write_protect_np(1);
+            arm_current_jit_protect_mode = JPM_ENABLED;
+        }
+    }
+}
+
+static void mono_arm_jit_write_protect_disable()
+{
+    if (__builtin_available(macOS 11, *)) {
+        if (arm_current_jit_protect_mode != JPM_DISABLED) {
+            pthread_jit_write_protect_np(0);
+            arm_current_jit_protect_mode = JPM_DISABLED;
+        }
+    }
+}
+
+#define MONO_SCOPE_ENABLE_JIT_WRITE()                    \
+    __attribute__((unused, cleanup(mono_arm_restore_jit_protect_mode))) \
+    jit_protect_mode scope_restrict_mode = arm_current_jit_protect_mode; \
+        mono_arm_jit_write_protect_disable();                    \
+
+#define MONO_SCOPE_ENABLE_JIT_EXEC()                    \
+    __attribute__((unused, cleanup(mono_arm_restore_jit_protect_mode))) \
+    jit_protect_mode scope_restrict_mode = arm_current_jit_protect_mode; \
+    mono_arm_jit_write_protect_enable();                \
+
+static void mono_arm_restore_jit_protect_mode(jit_protect_mode* previous_jit_protect_mode)
+{
+    if (*previous_jit_protect_mode == arm_current_jit_protect_mode)
+        return;
+
+    switch (*previous_jit_protect_mode)
+    {
+    case JPM_ENABLED:
+        mono_arm_jit_write_protect_enable();
+        break;
+    case JPM_DISABLED:
+    case JPM_NONE:
+    default:
+        mono_arm_jit_write_protect_disable();
+    }
+}
+
+#endif
+
 /* Relocations */
 #define MONO_R_ARM64_B 1
 #define MONO_R_ARM64_BCC 2

mono/mini/mini.h

@@ -2886,65 +2886,11 @@ gboolean MONO_SIG_HANDLER_SIGNATURE (mono_chain_signal);
 MonoGenericContext
 mono_get_generic_context_from_stack_frame (MonoJitInfo *ji, gpointer generic_info);
 
-#if defined(__APPLE__) && defined(__arm64__)
-
-typedef enum {
-	JPM_NONE,
-	JPM_ENABLED,
-	JPM_DISABLED,
-} jit_protect_mode;
-
-extern __thread jit_protect_mode arm_current_jit_protect_mode;
-
-static void mono_arm_jit_write_protect_enable()
-{
-	if (__builtin_available(macOS 11, *)) {
-		if (arm_current_jit_protect_mode != JPM_ENABLED) {
-			pthread_jit_write_protect_np(1);
-			arm_current_jit_protect_mode = JPM_ENABLED;
-		}
-	}
-}
-
-static void mono_arm_jit_write_protect_disable()
-{
-	if (__builtin_available(macOS 11, *)) {
-		if (arm_current_jit_protect_mode != JPM_DISABLED) {
-			pthread_jit_write_protect_np(0);
-			arm_current_jit_protect_mode = JPM_DISABLED;
-		}
-	}
-}
-
-#define MONO_SCOPE_ENABLE_JIT_WRITE()					\
-	__attribute__((unused, cleanup(mono_arm_restore_jit_protect_mode))) \
-	jit_protect_mode scope_restrict_mode = arm_current_jit_protect_mode; \
-        mono_arm_jit_write_protect_disable();					\
-
-#define MONO_SCOPE_ENABLE_JIT_EXEC()					\
-	__attribute__((unused, cleanup(mono_arm_restore_jit_protect_mode))) \
-	jit_protect_mode scope_restrict_mode = arm_current_jit_protect_mode; \
-	mono_arm_jit_write_protect_enable();				\
-
-static void mono_arm_restore_jit_protect_mode(jit_protect_mode* previous_jit_protect_mode)
-{
-	if (*previous_jit_protect_mode == arm_current_jit_protect_mode)
-		return;
-
-	switch (*previous_jit_protect_mode)
-	{
-	case JPM_ENABLED:
-		mono_arm_jit_write_protect_enable();
-		break;
-	case JPM_DISABLED:
-	case JPM_NONE:
-	default:
-		mono_arm_jit_write_protect_disable();
-	}
-}
-
-#else
+#ifndef MONO_SCOPE_ENABLE_JIT_WRITE
 #define MONO_SCOPE_ENABLE_JIT_WRITE()
+#endif
+
+#ifndef MONO_SCOPE_ENABLE_JIT_EXEC
 #define MONO_SCOPE_ENABLE_JIT_EXEC()
 #endif
 

mono/mini/unwind.c

@@ -518,8 +518,6 @@ mono_unwind_frame (guint8 *unwind_info, guint32 unwind_info_len,
 				   mgreg_t **save_locations, int save_locations_len,
 				   guint8 **out_cfa)
 {
-	MONO_SCOPE_ENABLE_JIT_WRITE();
-
 	Loc locations [NUM_HW_REGS];
 	guint8 reg_saved [NUM_HW_REGS];
 	int pos, reg, hwreg, cfa_reg = -1, cfa_offset = 0, offset;