iOS/tvOS: rework JIT availability checks (#15590)

This commit is contained in:
Eric Warmenhoven 2023-08-14 09:41:43 -04:00 committed by GitHub
parent 946c198e7b
commit ae78395d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 6 deletions

View File

@ -11,7 +11,7 @@
#include <stdbool.h> #include <stdbool.h>
bool jb_has_debugger_attached(void); bool jit_available(void);
bool jb_enable_ptrace_hack(void); bool jb_enable_ptrace_hack(void);
void jb_start_altkit(void); void jb_start_altkit(void);

View File

@ -10,16 +10,21 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "JITSupport.h"
#include <dlfcn.h> #include <dlfcn.h>
#include <mach/mach.h> #include <mach/mach.h>
#include <mach-o/dyld.h>
#include <mach-o/loader.h> #include <mach-o/loader.h>
#include <mach-o/getsect.h> #include <mach-o/getsect.h>
#include <pthread.h> #include <pthread.h>
#include <dirent.h>
#if defined(HAVE_ALTKIT) #if defined(HAVE_ALTKIT)
@import AltKit; @import AltKit;
#endif #endif
#include <string/stdstring.h>
#include "../../verbosity.h" #include "../../verbosity.h"
extern int csops(pid_t pid, unsigned int ops, void * useraddr, size_t usersize); extern int csops(pid_t pid, unsigned int ops, void * useraddr, size_t usersize);
@ -40,7 +45,7 @@ static void *exception_handler(void *argument) {
return NULL; return NULL;
} }
bool jb_has_debugger_attached(void) { static bool jb_has_debugger_attached(void) {
int flags; int flags;
return !csops(getpid(), CS_OPS_STATUS, &flags, sizeof(flags)) && flags & CS_DEBUGGED; return !csops(getpid(), CS_OPS_STATUS, &flags, sizeof(flags)) && flags & CS_DEBUGGED;
} }
@ -94,7 +99,7 @@ bool jb_enable_ptrace_hack(void) {
void jb_start_altkit(void) { void jb_start_altkit(void) {
#if HAVE_ALTKIT #if HAVE_ALTKIT
// asking AltKit/AltServer to debug us when we're already debugged is bad, very bad // asking AltKit/AltServer to debug us when we're already debugged is bad, very bad
if (jb_has_debugger_attached()) if (jit_available())
return; return;
[[ALTServerManager sharedManager] autoconnectWithCompletionHandler:^(ALTServerConnection *connection, NSError *error) { [[ALTServerManager sharedManager] autoconnectWithCompletionHandler:^(ALTServerConnection *connection, NSError *error) {
@ -114,3 +119,42 @@ void jb_start_altkit(void) {
[[ALTServerManager sharedManager] startDiscovering]; [[ALTServerManager sharedManager] startDiscovering];
#endif #endif
} }
bool jit_available(void)
{
static bool canOpenApps = false;
static dispatch_once_t appsOnce = 0;
dispatch_once(&appsOnce, ^{
DIR *apps = opendir("/Applications");
if (apps)
{
closedir(apps);
canOpenApps = true;
}
});
static bool dylded = false;
static dispatch_once_t dyldOnce = 0;
dispatch_once(&dyldOnce, ^{
int imageCount = _dyld_image_count();
for (int i = 0; i < imageCount; i++)
{
if (string_is_equal("/usr/lib/pspawn_payload-stg2.dylib", _dyld_get_image_name(i)))
dylded = true;
}
});
static bool doped = false;
static dispatch_once_t dopeOnce = 0;
dispatch_once(&dopeOnce, ^{
int64_t (*jbdswDebugMe)(void) = dlsym(RTLD_DEFAULT, "jbdswDebugMe");
if (jbdswDebugMe)
{
int64_t ret = jbdswDebugMe();
doped = (ret == 0);
}
});
/* the debugger could be attached at any time, its value can't be cached */
return canOpenApps || dylded || doped || jb_has_debugger_attached();
}

View File

@ -3472,7 +3472,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
case RETRO_ENVIRONMENT_GET_JIT_CAPABLE: case RETRO_ENVIRONMENT_GET_JIT_CAPABLE:
{ {
#if defined(HAVE_COCOATOUCH) && TARGET_OS_IOS #if defined(HAVE_COCOATOUCH) && TARGET_OS_IOS
*(bool*)data = jb_has_debugger_attached(); *(bool*)data = jit_available();
#else #else
*(bool*)data = true; *(bool*)data = true;
#endif #endif

View File

@ -314,14 +314,12 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
#if defined(HAVE_LIBNX) #if defined(HAVE_LIBNX)
mutexLock(&g_verbosity->mtx); mutexLock(&g_verbosity->mtx);
#endif #endif
#if !TARGET_OS_TV
if (fp) if (fp)
{ {
fprintf(fp, "%s ", tag_v); fprintf(fp, "%s ", tag_v);
vfprintf(fp, fmt, ap); vfprintf(fp, fmt, ap);
fflush(fp); fflush(fp);
} }
#endif
#if defined(HAVE_LIBNX) #if defined(HAVE_LIBNX)
mutexUnlock(&g_verbosity->mtx); mutexUnlock(&g_verbosity->mtx);
#endif #endif