Add visionOS support

kstenerud · Nov 12, 2023 · 861187f · 861187f
1 parent 58f4567
commit 861187f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/KSCrash.podspec b/KSCrash.podspec
@@ -10,6 +10,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target =  '10.13'
   s.tvos.deployment_target =  '11.0'
   s.watchos.deployment_target =  '4.0'
+  s.visionos.deployment_target =  '1.0'
   s.source       = { :git => "https://github.com/kstenerud/KSCrash.git", :tag=>s.version.to_s }
   s.frameworks = 'Foundation'
   s.libraries = 'c++', 'z'

diff --git a/Source/KSCrash/Recording/KSSystemCapabilities.h b/Source/KSCrash/Recording/KSSystemCapabilities.h
@@ -38,7 +38,8 @@
 #define KSCRASH_HOST_IOS (KSCRASH_HOST_APPLE && TARGET_OS_IOS)
 #define KSCRASH_HOST_TV (KSCRASH_HOST_APPLE && TARGET_OS_TV)
 #define KSCRASH_HOST_WATCH (KSCRASH_HOST_APPLE && TARGET_OS_WATCH)
-#define KSCRASH_HOST_MAC (KSCRASH_HOST_APPLE && TARGET_OS_MAC && !(TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH))
+#define KSCRASH_HOST_VISION (KSCRASH_HOST_APPLE && TARGET_OS_VISION)
+#define KSCRASH_HOST_MAC (KSCRASH_HOST_APPLE && TARGET_OS_MAC && !(TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH || TARGET_OS_VISION))
 
 #if KSCRASH_HOST_APPLE
 #define KSCRASH_CAN_GET_MAC_ADDRESS 1
@@ -66,13 +67,13 @@
 #define KSCRASH_HAS_STRNSTR 0
 #endif
 
-#if KSCRASH_HOST_IOS || KSCRASH_HOST_TV || KSCRASH_HOST_WATCH
+#if KSCRASH_HOST_IOS || KSCRASH_HOST_TV || KSCRASH_HOST_WATCH || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_UIKIT 1
 #else
 #define KSCRASH_HAS_UIKIT 0
 #endif
 
-#if KSCRASH_HOST_IOS || KSCRASH_HOST_TV
+#if KSCRASH_HOST_IOS || KSCRASH_HOST_TV || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_UIAPPLICATION 1
 #else
 #define KSCRASH_HAS_UIAPPLICATION 0
@@ -90,13 +91,13 @@
 #define KSCRASH_HAS_MESSAGEUI 0
 #endif
 
-#if KSCRASH_HOST_IOS || KSCRASH_HOST_TV
+#if KSCRASH_HOST_IOS || KSCRASH_HOST_TV || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_UIDEVICE 1
 #else
 #define KSCRASH_HAS_UIDEVICE 0
 #endif
 
-#if KSCRASH_HOST_IOS || KSCRASH_HOST_MAC || KSCRASH_HOST_TV
+#if KSCRASH_HOST_IOS || KSCRASH_HOST_MAC || KSCRASH_HOST_TV || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_ALERTVIEW 1
 #else
 #define KSCRASH_HAS_ALERTVIEW 0
@@ -114,32 +115,32 @@
 #define KSCRASH_HAS_NSALERT 0
 #endif
 
-#if KSCRASH_HOST_IOS || KSCRASH_HOST_MAC
+#if KSCRASH_HOST_IOS || KSCRASH_HOST_MAC || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_MACH 1
 #else
 #define KSCRASH_HAS_MACH 0
 #endif
 
 // WatchOS signal is broken as of 3.1
-#if KSCRASH_HOST_ANDROID || KSCRASH_HOST_IOS || KSCRASH_HOST_MAC || KSCRASH_HOST_TV
+#if KSCRASH_HOST_ANDROID || KSCRASH_HOST_IOS || KSCRASH_HOST_MAC || KSCRASH_HOST_TV || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_SIGNAL 1
 #else
 #define KSCRASH_HAS_SIGNAL 0
 #endif
 
-#if KSCRASH_HOST_ANDROID || KSCRASH_HOST_MAC || KSCRASH_HOST_IOS
+#if KSCRASH_HOST_ANDROID || KSCRASH_HOST_MAC || KSCRASH_HOST_IOS || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_SIGNAL_STACK 1
 #else
 #define KSCRASH_HAS_SIGNAL_STACK 0
 #endif
 
-#if KSCRASH_HOST_MAC || KSCRASH_HOST_IOS || KSCRASH_HOST_TV
+#if KSCRASH_HOST_MAC || KSCRASH_HOST_IOS || KSCRASH_HOST_TV || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_THREADS_API 1
 #else
 #define KSCRASH_HAS_THREADS_API 0
 #endif
 
-#if KSCRASH_HOST_MAC || KSCRASH_HOST_IOS || KSCRASH_HOST_TV
+#if KSCRASH_HOST_MAC || KSCRASH_HOST_IOS || KSCRASH_HOST_TV || KSCRASH_HOST_VISION
 #define KSCRASH_HAS_REACHABILITY 1
 #else
 #define KSCRASH_HAS_REACHABILITY 0

diff --git a/Source/KSCrash/Recording/Tools/KSCPU.c b/Source/KSCrash/Recording/Tools/KSCPU.c
@@ -32,14 +32,22 @@
 #include <mach/mach.h>
 #include <mach-o/arch.h>
 
+#if KSCRASH_HOST_VISION
+#include <mach-o/utils.h>
+#endif
+
 //#define KSLogger_LocalLevel TRACE
 #include "KSLogger.h"
 
 
 const char* kscpu_currentArch(void)
 {
+#if KSCRASH_HOST_VISION
+    return macho_arch_name_for_mach_header(NULL);
+#else
     const NXArchInfo* archInfo = NXGetLocalArchInfo();
     return archInfo == NULL ? NULL : archInfo->name;
+#endif
 }
 
 #if KSCRASH_HAS_THREADS_API