From 20794081eab467e25168a198c9c117b12ad1bbe8 Mon Sep 17 00:00:00 2001
From: Kentucky Compass <KentuckyCompass@rocketmail.com>
Date: Mon, 1 Jan 2018 18:51:18 -0800
Subject: [PATCH] iOS: Nix iosCanUseJit and targetIsJailbroken. Move NativeInit
 call to main so it can take cmd line args.

---
 Core/Config.cpp           | 14 ++------------
 UI/GameSettingsScreen.cpp |  5 -----
 UI/NativeApp.cpp          |  5 -----
 ios/ViewController.mm     | 23 -----------------------
 ios/main.mm               |  8 +++++++-
 5 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index 78d8eb7b8..744695e05 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -55,11 +55,6 @@ static const char *logSectionName = "LogDebug";
 static const char *logSectionName = "Log";
 #endif
 
-
-#ifdef IOS
-extern bool iosCanUseJit;
-#endif
-
 struct ConfigSetting {
 	enum Type {
 		TYPE_TERMINATOR,
@@ -314,11 +309,8 @@ static int DefaultNumWorkers() {
 	return cpu_info.num_cores;
 }
 
-// TODO: Default to IRJit on iOS when it's done.
 static int DefaultCpuCore() {
-#ifdef IOS
-	return (int)(iosCanUseJit ? CPUCore::JIT : CPUCore::INTERPRETER);
-#elif defined(ARM) || defined(ARM64) || defined(_M_IX86) || defined(_M_X64)
+#if defined(ARM) || defined(ARM64) || defined(_M_IX86) || defined(_M_X64)
 	return (int)CPUCore::JIT;
 #else
 	return (int)CPUCore::INTERPRETER;
@@ -326,9 +318,7 @@ static int DefaultCpuCore() {
 }
 
 static bool DefaultCodeGen() {
-#ifdef IOS
-	return iosCanUseJit ? true : false;
-#elif defined(ARM) || defined(ARM64) || defined(_M_IX86) || defined(_M_X64)
+#if defined(ARM) || defined(ARM64) || defined(_M_IX86) || defined(_M_X64)
 	return true;
 #else
 	return false;
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index c82f9c111..bef66c4c0 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -67,11 +67,6 @@
 #include "gfx/gl_common.h"
 #endif
 
-#ifdef IOS
-extern bool iosCanUseJit;
-extern bool targetIsJailbroken;
-#endif
-
 extern bool VulkanMayBeAvailable();
 
 GameSettingsScreen::GameSettingsScreen(std::string gamePath, std::string gameID, bool editThenRestore)
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 7ad706a0b..1c5156622 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -130,11 +130,6 @@ std::string config_filename;
 
 bool g_graphicsInited;
 
-#ifdef IOS
-bool iosCanUseJit;
-bool targetIsJailbroken;
-#endif
-
 // Really need to clean this mess of globals up... but instead I add more :P
 bool g_TakeScreenshot;
 static bool isOuya;
diff --git a/ios/ViewController.mm b/ios/ViewController.mm
index 33431324c..6ba33c932 100644
--- a/ios/ViewController.mm
+++ b/ios/ViewController.mm
@@ -62,9 +62,6 @@ bool simulateAnalog = false;
 
 extern ScreenManager *screenManager;
 
-extern bool iosCanUseJit;
-extern bool targetIsJailbroken;
-
 __unsafe_unretained static ViewController* sharedViewController;
 static GraphicsContext *graphicsContext;
 
@@ -98,26 +95,6 @@ static GraphicsContext *graphicsContext;
 	if (self) {
 		sharedViewController = self;
 		self.touches = [NSMutableArray array];
-		self.documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
-		self.bundlePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/assets/"];
-
-		iosCanUseJit = true;
-		targetIsJailbroken = false;
-		NSArray *jailPath = [NSArray arrayWithObjects:
-							@"/Applications/Cydia.app",
-							@"/private/var/lib/apt",
-							@"/private/var/stash",
-							@"/usr/sbin/sshd",
-							@"/usr/bin/sshd", nil];
-
-		for (NSString *string in jailPath) {
-			if ([[NSFileManager defaultManager] fileExistsAtPath:string]) {
-				// checking device jailbreak status in order to determine which message to show in GameSettingsScreen
-				targetIsJailbroken = true;
-			}
-		}
-		
-		NativeInit(0, NULL, [self.documentsPath UTF8String], [self.bundlePath UTF8String], NULL);
 
 		iCadeToKeyMap[iCadeJoystickUp]		= NKCODE_DPAD_UP;
 		iCadeToKeyMap[iCadeJoystickRight]	= NKCODE_DPAD_RIGHT;
diff --git a/ios/main.mm b/ios/main.mm
index c6eb2d3c7..596e089bd 100644
--- a/ios/main.mm
+++ b/ios/main.mm
@@ -112,7 +112,13 @@ int main(int argc, char *argv[])
 {
 	// Simulates a debugger. Makes it possible to use JIT (though only W^X)
 	syscall(SYS_ptrace, 0 /*PTRACE_TRACEME*/, 0, 0, 0);
+	
 	@autoreleasepool {
-        return UIApplicationMain(argc, argv, NSStringFromClass([PPSSPPUIApplication class]), NSStringFromClass([AppDelegate class]));
+		NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
+		NSString *bundlePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/assets/"];
+		
+		NativeInit(argc, (const char**)argv, documentsPath.UTF8String, bundlePath.UTF8String, NULL);
+		
+		return UIApplicationMain(argc, argv, NSStringFromClass([PPSSPPUIApplication class]), NSStringFromClass([AppDelegate class]));
 	}
 }