[RFC / WIP] iOS support with working JIT

CMakeLists.txt

@@ -2,10 +2,13 @@
 # General setup
 #
 cmake_minimum_required(VERSION 3.10)
-set(CMAKE_OSX_ARCHITECTURES "x86_64")
-# Minimum OS X version.
-# This is inserted into the Info.plist as well.
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10.0" CACHE STRING "")
+
+if(APPLE AND NOT IOS)
+  set(CMAKE_OSX_ARCHITECTURES "x86_64")
+  # Minimum OS X version.
+  # This is inserted into the Info.plist as well.
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10.0" CACHE STRING "")
+endif()
 
 project(dolphin-emu)
 
@@ -28,6 +31,7 @@ option(ENABLE_QT "Enable Qt (Default)" ON)
 option(ENABLE_LTO "Enables Link Time Optimization" OFF)
 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
 option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
+option(ENABLE_WX_EXCLUSIVITY "Enables W^X for platforms that need it" OFF)
 option(ENABLE_ALSA "Enables ALSA sound backend" ON)
 option(ENABLE_PULSEAUDIO "Enables PulseAudio sound backend" ON)
 option(ENABLE_LLVM "Enables LLVM support, for disassembly" ON)
@@ -196,13 +200,16 @@ elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
   add_definitions(-D_M_X86=1)
   add_definitions(-D_M_X86_64=1)
   check_and_add_flag(HAVE_SSE2 -msse2)
-elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
   set(_M_ARM 1)
   set(_M_ARM_64 1)
   add_definitions(-D_M_ARM=1)
   add_definitions(-D_M_ARM_64=1)
-  # CRC instruction set is used in the CRC32 hash function
-  check_and_add_flag(HAVE_ARCH_ARMV8 -march=armv8-a+crc)
+
+  if (ANDROID OR IOS)
+    # CRC instruction set is used in the CRC32 hash function
+    check_and_add_flag(HAVE_ARCH_ARMV8 -march=armv8-a+crc)
+  endif()
 else()
   message(FATAL_ERROR "You're building on an unsupported platform: "
       "'${CMAKE_SYSTEM_PROCESSOR}' with ${CMAKE_SIZEOF_VOID_P}-byte pointers."
@@ -278,7 +285,7 @@ else()
   endif()
 endif()
 
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT IOS)
   if(NOT OSX_USE_DEFAULT_SEARCH_PATH)
     # Hack up the path to prioritize the path to built-in OS libraries to
     # increase the chance of not depending on a bunch of copies of them
@@ -299,6 +306,9 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   # Drop unreachable code and data.
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip,-dead_strip_dylibs")
 
+  # Add define for macOS
+  add_definitions(-DMACOS)
+
   find_library(APPKIT_LIBRARY AppKit)
   find_library(APPSERV_LIBRARY ApplicationServices)
   find_library(CARBON_LIBRARY Carbon)
@@ -398,12 +408,43 @@ if(ANDROID)
   SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 endif()
 
+if(IOS)
+  message(STATUS "Building for iOS")
+
+  add_definitions(-DIPHONEOS)
+
+  if(ENABLE_NOGUI)
+    message(STATUS "Building iOS app, disabling NoGUI frontend.")
+    set(ENABLE_NOGUI 0)
+  endif()
+
+  set(ENABLE_WX_EXCLUSIVITY 1)
+  set(USE_UPNP 0)
+  set(ENABLE_QT 0)
+  set(USE_DISCORD_PRESENCE 0)
+
+  # We are cross compiling, search only the toolchain for libraries and includes
+  SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+  SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+endif()
+
 if(ENABLE_HEADLESS)
   message(STATUS "Enabling Headless! Disabling GUI.")
   set(ENABLE_QT 0)
   set(USE_DISCORD_PRESENCE 0)
 endif()
 
+if(ENABLE_WX_EXCLUSIVITY)
+  message(STATUS "Enabling WX exclusivity.")
+  if(NOT WIN32 AND NOT APPLE)
+    message(FATAL_ERROR "WX exclusivity is not supported on this platform.")
+  endif()
+
+  add_definitions(-D_WX_EXCLUSIVITY)
+endif()
+
 # Set file offset size to 64 bits.
 #
 # On modern Unixes, this is typically already the case. The lone exception is
@@ -621,15 +662,21 @@ endif()
 add_subdirectory(Externals/soundtouch)
 include_directories(Externals)
 
-find_package(Cubeb)
-if(CUBEB_FOUND)
-  message(STATUS "Using the system cubeb")
-else()
-  message(STATUS "Using static cubeb from Externals")
-  add_subdirectory(Externals/cubeb EXCLUDE_FROM_ALL)
+# Cubeb support for iOS is old and broken.
+# See: https://github.com/kinetiknz/cubeb/issues/394
+if(NOT IOS)
+  find_package(Cubeb)
+  if(CUBEB_FOUND)
+    message(STATUS "Using the system cubeb")
+  else()
+    message(STATUS "Using static cubeb from Externals")
+    add_subdirectory(Externals/cubeb EXCLUDE_FROM_ALL)
+    set(CUBEB_FOUND true)
+  endif()
+  add_definitions(-DHAVE_CUBEB)
 endif()
 
-if(NOT ANDROID)
+if(NOT ANDROID AND NOT IOS)
   add_definitions(-D__LIBUSB__)
   if(NOT APPLE)
     find_package(LibUSB)
@@ -700,7 +747,7 @@ if (NOT ANDROID)
   find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
 endif()
 
-if (NOT ANDROID AND ICONV_LIBRARIES AND ICONV_INCLUDE_DIR)
+if (NOT ANDROID AND NOT IOS AND ICONV_LIBRARIES AND ICONV_INCLUDE_DIR)
   mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARIES)
 else()
   message(STATUS "Using static iconv from Externals")
@@ -709,7 +756,7 @@ else()
   set(ICONV_LIBRARIES iconv)
 endif()
 
-if(NOT ANDROID)
+if(NOT ANDROID AND NOT IOS)
   find_package(HIDAPI)
   if(NOT HIDAPI_FOUND)
     message(STATUS "Using static HIDAPI from Externals")

Externals/curl/lib/curl_setup_once.h

@@ -119,7 +119,7 @@ struct timeval {
  * it as the fourth argument of function send()
  */
 
-#ifdef HAVE_MSG_NOSIGNAL
+#if !defined(__APPLE__) && HAVE_MSG_NOSIGNAL
 #define SEND_4TH_ARG MSG_NOSIGNAL
 #else
 #define SEND_4TH_ARG 0

Source/Android/app/build.gradle

@@ -75,6 +75,10 @@ android {
     }
 }
 
+ext {
+    androidSupportVersion = '28.0.0'
+}
+
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.exifinterface:exifinterface:1.1.0'

Source/CMakeLists.txt

@@ -72,6 +72,10 @@ if (ANDROID)
   add_subdirectory(Android/jni)
 endif()
 
+if (IOS)
+  add_subdirectory(iOS/Interface)
+endif()
+
 if (ENABLE_TESTS)
   add_subdirectory(UnitTests)
 endif()

Source/Core/AudioCommon/AudioCommon.cpp

@@ -4,6 +4,7 @@
 
 #include "AudioCommon/AudioCommon.h"
 #include "AudioCommon/AlsaSoundStream.h"
+#include "AudioCommon/CoreAudioSoundStream.h"
 #include "AudioCommon/CubebStream.h"
 #include "AudioCommon/Mixer.h"
 #include "AudioCommon/NullSoundStream.h"
@@ -29,14 +30,16 @@ constexpr int AUDIO_VOLUME_MAX = 100;
 
 static std::unique_ptr<SoundStream> CreateSoundStreamForBackend(std::string_view backend)
 {
-  if (backend == BACKEND_CUBEB)
+  if (backend == BACKEND_CUBEB && CubebStream::isValid())
     return std::make_unique<CubebStream>();
   else if (backend == BACKEND_OPENAL && OpenALStream::isValid())
     return std::make_unique<OpenALStream>();
   else if (backend == BACKEND_NULLSOUND)
     return std::make_unique<NullSound>();
   else if (backend == BACKEND_ALSA && AlsaSound::isValid())
     return std::make_unique<AlsaSound>();
+  else if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid())
+    return std::make_unique<CoreAudioSound>();
   else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
     return std::make_unique<PulseAudio>();
   else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid())
@@ -92,10 +95,12 @@ std::string GetDefaultSoundBackend()
   std::string backend = BACKEND_NULLSOUND;
 #if defined ANDROID
   backend = BACKEND_OPENSLES;
+#elif defined IPHONEOS
+  backend = BACKEND_COREAUDIO;
 #elif defined __linux__
   if (AlsaSound::isValid())
     backend = BACKEND_ALSA;
-#elif defined(__APPLE__) || defined(_WIN32)
+#elif defined HAVE_CUBEB
   backend = BACKEND_CUBEB;
 #endif
   return backend;
@@ -111,7 +116,8 @@ std::vector<std::string> GetSoundBackends()
   std::vector<std::string> backends;
 
   backends.emplace_back(BACKEND_NULLSOUND);
-  backends.emplace_back(BACKEND_CUBEB);
+  if (CubebStream::isValid())
+    backends.emplace_back(BACKEND_CUBEB);
   if (AlsaSound::isValid())
     backends.emplace_back(BACKEND_ALSA);
   if (PulseAudio::isValid())
@@ -149,7 +155,8 @@ bool SupportsVolumeChanges(std::string_view backend)
   // FIXME: this one should ask the backend whether it supports it.
   //       but getting the backend from string etc. is probably
   //       too much just to enable/disable a stupid slider...
-  return backend == BACKEND_CUBEB || backend == BACKEND_OPENAL || backend == BACKEND_WASAPI;
+  return backend == BACKEND_COREAUDIO || backend == BACKEND_CUBEB || backend == BACKEND_OPENAL ||
+         backend == BACKEND_WASAPI;
 }
 
 void UpdateSoundStream()

Source/Core/AudioCommon/CMakeLists.txt

@@ -3,10 +3,6 @@ add_library(audiocommon
   AudioCommon.h
   AudioStretcher.cpp
   AudioStretcher.h
-  CubebStream.cpp
-  CubebStream.h
-  CubebUtils.cpp
-  CubebUtils.h
   Enums.h
   Mixer.cpp
   Mixer.h
@@ -18,6 +14,15 @@ add_library(audiocommon
   WaveFile.h
 )
 
+if(CUBEB_FOUND)
+  target_sources(audiocommon PRIVATE
+    CubebStream.cpp
+    CubebStream.h
+    CubebUtils.cpp
+    CubebUtils.h
+  )
+endif()
+
 find_package(OpenSLES)
 if(OPENSLES_FOUND)
   message(STATUS "OpenSLES found, enabling OpenSLES sound backend")
@@ -75,4 +80,11 @@ if(WIN32)
   )
 endif()
 
+if(IOS)
+  target_sources(audiocommon PRIVATE
+    CoreAudioSoundStream.cpp
+    CoreAudioSoundStream.h
+  )
+endif()
+
 target_link_libraries(audiocommon PRIVATE cubeb SoundTouch FreeSurround)