[arm64] Scan simd registers on apple

[mono.git] / mono / utils / mono-threads-mach-helper.c

diff --git a/mono/utils/mono-threads-mach-helper.c b/mono/utils/mono-threads-mach-helper.c
index 0e95d4e878e6eb1c7f3789dc8c13b92fdd456731..db1e5b9fce9fe7fee582d6437afedf335c07f356 100644 (file)
--- a/mono/utils/mono-threads-mach-helper.c
+++ b/mono/utils/mono-threads-mach-helper.c
@@ -1,5 +1,6 @@
-/*
- * mono-threads-mach-helper.c: ObjectiveC hacks to improve our changes with thread shutdown
+/**
+ * \file
+ * ObjectiveC hacks to improve our changes with thread shutdown
  *
  * Author:
  *     Rodrigo Kumpera (kumpera@gmail.com)
@@ -11,6 +12,7 @@
 
 #if defined(__MACH__)
 
+#include <stdio.h>
 #include <objc/runtime.h>
 #include <objc/message.h>
 #include <mono/utils/mono-compiler.h>
@@ -20,9 +22,9 @@
  * which conflicts with objc.
  * Hence the hack here.
 */
-void mono_threads_init_dead_letter (void) MONO_INTERNAL;
-void mono_threads_install_dead_letter (void) MONO_INTERNAL;
-void mono_thread_info_detach (void) MONO_INTERNAL;
+void mono_threads_init_dead_letter (void);
+void mono_threads_install_dead_letter (void);
+void mono_thread_info_detach (void);
 
 static Class nsobject, nsthread, mono_dead_letter_class;
 static SEL dealloc, release, currentThread, threadDictionary, init, alloc, objectForKey, setObjectForKey;
@@ -66,25 +68,24 @@ mono_threads_install_dead_letter (void)
 {
        id cur, dict;
 
+       /*
+        * See the 'Dispatch Objective-C Messages Using the Method Function’s Prototype' section in
+        * the '64-Bit Transition Guide for Cocoa Touch' as to why this is required.
+        *
+        * It doesn't hurt on other architectures either, so no need to #ifdef it only for ARM64.
+        */
+
+       id (*id_objc_msgSend_id)(id, SEL, id) = (id (*)(id, SEL, id)) objc_msgSend;
+       void (*objc_msgSend_id_id)(id, SEL, id, id) = (void (*)(id, SEL, id, id)) objc_msgSend;
+
        cur = objc_msgSend ((id)nsthread, currentThread);
        if (!cur)
                return;
        dict = objc_msgSend (cur, threadDictionary);
-       if (dict && objc_msgSend (dict, objectForKey, mono_dead_letter_key) == nil) {
+       if (dict && id_objc_msgSend_id (dict, objectForKey, mono_dead_letter_key) == nil) {
                id value = objc_msgSend (objc_msgSend ((id)mono_dead_letter_class, alloc), init);
 
-#ifdef TARGET_ARM64
-               /*
-                * See the 'Dispatch Objective-C Messages Using the Method Function’s Prototype' section in
-                * the '64-Bit Transition Guide for Cocoa Touch' as to why this is required.
-                */
-               {
-                       void (*action)(id, SEL, id, id) = (void (*)(id, SEL, id, id)) objc_msgSend;
-                       action (dict, setObjectForKey, value, mono_dead_letter_key);
-               }
-#else
-               objc_msgSend (dict, setObjectForKey, value, mono_dead_letter_key);
-#endif
+               objc_msgSend_id_id (dict, setObjectForKey, value, mono_dead_letter_key);
 
                objc_msgSend (value, release);
        }
@@ -93,8 +94,8 @@ mono_threads_install_dead_letter (void)
 void
 mono_threads_init_dead_letter (void)
 {
-       id nsstring = objc_getClass ("NSString");
-       id nsautoreleasepool = objc_getClass ("NSAutoreleasePool");
+       id nsstring = (id) objc_getClass ("NSString");
+       id nsautoreleasepool = (id) objc_getClass ("NSAutoreleasePool");
        SEL stringWithUTF8String = sel_registerName ("stringWithUTF8String:");
        SEL retain = sel_registerName ("retain");
        id pool;
@@ -121,14 +122,8 @@ mono_threads_init_dead_letter (void)
        // create the dict key
        pool = objc_msgSend (objc_msgSend (nsautoreleasepool, alloc), init);
 
-#ifdef TARGET_ARM64
-       {
-               id (*action)(id, SEL, char*) = (id (*)(id, SEL, char*)) objc_msgSend;
-               mono_dead_letter_key = action(nsstring, stringWithUTF8String, "mono-dead-letter");
-       }
-#else
-       mono_dead_letter_key = objc_msgSend (nsstring, stringWithUTF8String, "mono-dead-letter");
-#endif
+       id (*objc_msgSend_char)(id, SEL, const char*) = (id (*)(id, SEL, const char*)) objc_msgSend;
+       mono_dead_letter_key = objc_msgSend_char (nsstring, stringWithUTF8String, "mono-dead-letter");
 
        objc_msgSend (mono_dead_letter_key, retain);
        objc_msgSend (pool, release);