rpcs3_version: Bump to 0.0.28

PPU LLVM: Invalidate cache for testers
sys_lwcond/cond/ppu_thread: Respect scheduler in various syscalls
2023-06-02 19:54:07 +02:00 · 2023-06-02 08:54:46 +03:00 · 2023-06-02 08:54:46 +03:00 · 2023-06-02 08:54:46 +03:00 · 2023-06-02 08:54:46 +03:00 · 2023-06-02 08:54:46 +03:00
910 changed files with 74704 additions and 26101 deletions
@@ -3,15 +3,16 @@
 # Pull all the submodules except llvm
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
+git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/SPIRV/ { print $3 }' .gitmodules)

 # Prefer newer Clang than in base system (see also .ci/install-freebsd.sh)
 # libc++ isn't in llvm* packages, so download manually
-fetch https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-13.0.1-rc1.tar.gz
-tar xf llvm*.tar.gz
-export CC=clang13 CXX=clang++13
+fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz
+tar xf llvm*.tar.xz
+export CC=clang16 CXX=clang++16
 cmake -B libcxx_build -G Ninja -S llvm*/libcxx \
      -DLLVM_CCACHE_BUILD=ON \
+      -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
      -DCMAKE_INSTALL_PREFIX:PATH=libcxx_prefix
 cmake --build libcxx_build
 cmake --install libcxx_build
@@ -19,7 +20,8 @@ export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem$PWD/libcxx_prefix/include/c++/v1
 export LDFLAGS="$LDFLAGS -nostdlib++ -L$PWD/libcxx_prefix/lib -l:libc++.a -lcxxrt"

 CONFIGURE_ARGS="
-	-DWITH_LLVM=OFF
+	-DWITH_LLVM=ON
+	-DUSE_SDL=OFF
 	-DUSE_PRECOMPILED_HEADERS=OFF
 	-DUSE_NATIVE_INSTRUCTIONS=OFF
 	-DUSE_SYSTEM_FFMPEG=ON
@@ -1,49 +1,42 @@
 #!/bin/sh -ex

 # Setup Qt variables
-export QT_BASE_DIR=/opt/qt${QTVERMIN}
-export PATH=$QT_BASE_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib
+export QT_BASE_DIR=/opt/qt"${QTVERMIN}"
+export PATH="$QT_BASE_DIR"/bin:"$PATH"
+export LD_LIBRARY_PATH="$QT_BASE_DIR"/lib/x86_64-linux-gnu:"$QT_BASE_DIR"/lib

 if [ -z "$CIRRUS_CI" ]; then
   cd rpcs3 || exit 1
 fi

-# Pull all the submodules except llvm, since it is built separately and we just download that build
+# Pull all the submodules except llvm
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
-
-# Download pre-compiled llvm libs
-curl -sLO https://github.com/RPCS3/llvm-mirror/releases/download/custom-build/llvmlibs-linux.tar.gz
-mkdir llvmlibs
-tar -xzf ./llvmlibs-linux.tar.gz -C llvmlibs
+git submodule -q update --init $(awk '/path/ && !/llvm/ && !/SPIRV/ { print $3 }' .gitmodules)

 mkdir build && cd build || exit 1

 if [ "$COMPILER" = "gcc" ]; then
    # These are set in the dockerfile
-    export CC=${GCC_BINARY}
-    export CXX=${GXX_BINARY}
+    export CC="${GCC_BINARY}"
+    export CXX="${GXX_BINARY}"
    export LINKER=gold
    # We need to set the following variables for LTO to link properly
-    export AR=/usr/bin/gcc-ar-$GCCVER
-    export RANLIB=/usr/bin/gcc-ranlib-$GCCVER
+    export AR=/usr/bin/gcc-ar-"$GCCVER"
+    export RANLIB=/usr/bin/gcc-ranlib-"$GCCVER"
    export CFLAGS="-fuse-linker-plugin"
 else
-    export CC=${CLANG_BINARY}
-    export CXX=${CLANGXX_BINARY}
+    export CC="${CLANG_BINARY}"
+    export CXX="${CLANGXX_BINARY}"
    export LINKER=lld
-    export AR=/usr/bin/llvm-ar-$LLVMVER
-    export RANLIB=/usr/bin/llvm-ranlib-$LLVMVER
+    export AR=/usr/bin/llvm-ar-"$LLVMVER"
+    export RANLIB=/usr/bin/llvm-ranlib-"$LLVMVER"
 fi

 export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"

 cmake ..                                               \
    -DCMAKE_INSTALL_PREFIX=/usr                        \
-    -DBUILD_LLVM_SUBMODULE=OFF                         \
-    -DLLVM_DIR=llvmlibs/lib/cmake/llvm/                \
    -DUSE_NATIVE_INSTRUCTIONS=OFF                      \
    -DUSE_PRECOMPILED_HEADERS=OFF                      \
    -DCMAKE_C_FLAGS="$CFLAGS"                          \
@@ -51,7 +44,10 @@ cmake ..                                               \
    -DCMAKE_AR="$AR"                                   \
    -DCMAKE_RANLIB="$RANLIB"                           \
    -DUSE_SYSTEM_CURL=ON                               \
+    -DUSE_SDL=ON                                       \
    -DOpenGL_GL_PREFERENCE=LEGACY                      \
+    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
+    -DSTATIC_LINK_LLVM=ON                              \
    -G Ninja

 ninja; build_status=$?;
@@ -1,15 +1,44 @@
 #!/bin/sh -ex

-brew update
-brew install llvm@13 sdl2 nasm qt@5 ninja cmake glew git p7zip create-dmg ccache
+brew install -f --overwrite nasm ninja git p7zip create-dmg ccache pipenv

-export MACOSX_DEPLOYMENT_TARGET=11.6
+#/usr/sbin/softwareupdate --install-rosetta --agree-to-license
+arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+arch -x86_64 /usr/local/homebrew/bin/brew update
+arch -x86_64 /usr/local/homebrew/bin/brew install -f --overwrite llvm@16 sdl2 glew cmake
+arch -x86_64 /usr/local/homebrew/bin/brew link -f llvm@16
+
+#export MACOSX_DEPLOYMENT_TARGET=12.0
 export CXX=clang++
 export CC=clang
-export Qt5_DIR="/usr/local/opt/qt@5/lib/cmake/Qt5"
-export PATH="/usr/local/opt/llvm@13/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin"
-export LDFLAGS="-L/usr/local/opt/llvm@13/lib -Wl,-rpath,/usr/local/opt/llvm@13/lib"
-export CPPFLAGS="-I/usr/local/opt/llvm@13/include -msse -msse2 -mcx16 -no-pie"
+
+export BREW_PATH;
+BREW_PATH="$(brew --prefix)"
+export BREW_X64_PATH;
+BREW_X64_PATH="$("/usr/local/homebrew/bin/brew" --prefix)"
+export BREW_BIN="/usr/local/bin"
+export BREW_SBIN="/usr/local/sbin"
+export CMAKE_EXTRA_OPTS='-DLLVM_TARGETS_TO_BUILD=X86'
+
+export WORKDIR;
+WORKDIR="$(pwd)"
+
+# Get Qt
+git clone https://github.com/engnr/qt-downloader.git
+cd qt-downloader
+git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
+"/opt/homebrew/bin/pipenv" run pip3 install py7zr requests semantic_version lxml
+"/opt/homebrew/bin/pipenv" run ./qt-downloader macos desktop 5.15.2 clang_64 --opensource
+cd ..
+
+export Qt5_DIR="$WORKDIR/qt-downloader/5.15.2/clang_64/lib/cmake/Qt5"
+export SDL2_DIR="$BREW_X64_PATH/opt/sdl2/lib/cmake/SDL2"
+
+export PATH="$BREW_X64_PATH/opt/llvm@16/bin:$WORKDIR/qt-downloader/5.15.2/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
+export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib"
+export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie"
+export LIBRARY_PATH="$BREW_X64_PATH/lib"
+export LD_LIBRARY_PATH="$BREW_X64_PATH/lib"

 git submodule update --init --recursive --depth 1

@@ -18,16 +47,18 @@ sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVer

 mkdir build && cd build || exit 1

-cmake .. \
-    -DUSE_DISCORD_RPC=OFF -DUSE_VULKAN=ON -DUSE_ALSA=OFF -DUSE_PULSE=OFF -DUSE_AUDIOUNIT=ON \
-    -DLLVM_CCACHE_BUILD=OFF -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF \
+"$BREW_X64_PATH/bin/cmake" .. \
+    -DUSE_SDL=ON -DUSE_DISCORD_RPC=OFF -DUSE_VULKAN=ON -DUSE_ALSA=OFF -DUSE_PULSE=OFF -DUSE_AUDIOUNIT=ON \
+    -DLLVM_CCACHE_BUILD=OFF -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF \
    -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF \
    -DLLVM_INCLUDE_UTILS=OFF -DLLVM_USE_PERF=OFF -DLLVM_ENABLE_Z3_SOLVER=OFF \
    -DUSE_NATIVE_INSTRUCTIONS=OFF \
    -DUSE_SYSTEM_MVK=OFF \
+    $CMAKE_EXTRA_OPTS \
+    -DLLVM_TARGET_ARCH=X86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \
    -G Ninja

-ninja; build_status=$?;
+"$BREW_PATH/bin/ninja"; build_status=$?;

 cd ..

@@ -36,4 +67,4 @@ cd ..

 if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
    .ci/deploy-mac.sh
-fi
+fi
@@ -3,44 +3,27 @@
 cd build || exit 1

 if [ "$DEPLOY_APPIMAGE" = "true" ]; then
-    DESTDIR=appdir ninja install
-    QT_APPIMAGE="linuxdeployqt.AppImage"
+    DESTDIR=AppDir ninja install

-    curl -sL "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" > "$QT_APPIMAGE"
-    chmod a+x "$QT_APPIMAGE"
-    "./$QT_APPIMAGE" --appimage-extract
-    ./squashfs-root/AppRun ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs
-    ls ./appdir/usr/lib/
-    rm -r ./appdir/usr/share/doc
-    cp "$(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1)" ./appdir/usr/lib/libnsl.so.1
-    export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH}
+    curl -sL -o /usr/bin/linuxdeploy https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+    chmod +x /usr/bin/linuxdeploy
+    curl -sL -o /usr/bin/linuxdeploy-plugin-qt https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+    chmod +x /usr/bin/linuxdeploy-plugin-qt
+    curl -sL -o linuxdeploy-plugin-checkrt.sh https://github.com/linuxdeploy/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt-x86_64.sh
+    chmod +x ./linuxdeploy-plugin-checkrt.sh
+
+    EXTRA_QT_PLUGINS="svg;" APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt

-    # Embed newer libstdc++ for distros that don't come with it (ubuntu 16.04)
-    mkdir -p appdir/usr/optional/ ; mkdir -p appdir/usr/optional/libstdc++/
-    cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/
-    
    # Remove libwayland-client because it has platform-dependent exports and breaks other OSes
-    rm -f ./appdir/usr/lib/libwayland-client.so*
-    
-    # Install latest appimage runner
-    rm ./appdir/AppRun
-    curl -sL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/AppRun-patched-x86_64 -o ./appdir/AppRun
-    chmod a+x ./appdir/AppRun
-    curl -sL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/exec-x86_64.so -o ./appdir/usr/optional/exec.so
+    rm -f ./AppDir/usr/lib/libwayland-client.so*

-    # Compile checker binary for AppImageKit-checkrt
+    # Remove git directory containing local commit history file
+    rm -rf ./AppDir/usr/share/rpcs3/git

-    # This may need updating if you update the compiler or rpcs3 uses newer c++ features
-    # See https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/config/abi/pre/gnu.ver
-    # for which definitions correlate to which CXXABI version.
-    # Currently we target a minimum of GLIBCXX_3.4.29 and CXXABI_1.3.11
-    printf "#include <sstream>\n#include <exception>\n#include <memory_resource>\nint main(){auto x = std::stringbuf();x.get_allocator();std::make_exception_ptr(0);std::pmr::get_default_resource();}" \
-     | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker -
+    ./linuxdeploy-plugin-checkrt.sh --appdir AppDir

-    # Package it up and send it off
-    ./squashfs-root/usr/bin/appimagetool "$APPDIR"
-    
-    ls
+    linuxdeploy --appimage-extract
+    ./squashfs-root/plugins/linuxdeploy-plugin-appimage/usr/bin/appimagetool AppDir -g

    COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ../rpcs3/rpcs3_version.cpp)
    COMM_COUNT="$(git rev-list --count HEAD)"
@@ -57,9 +40,4 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
    FILESIZE=$(stat -c %s ./rpcs3*.AppImage)
    SHA256SUM=$(sha256sum ./rpcs3*.AppImage | awk '{ print $1 }')
    echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE"
-    
-fi
-
-if [ "$DEPLOY_PPA" = "true" ]; then
-    export DEBFULLNAME="RPCS3 Build Bot"
 fi
@@ -14,14 +14,17 @@ echo "AVVER=$AVVER" >> ../.ci/ci-vars.env

 cd bin
 mkdir "rpcs3.app/Contents/lib/"
-cp "/usr/local/opt/llvm@13/lib/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"
+
+cp "/usr/local/Homebrew/opt/llvm@16/lib/c++/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"
+
 rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \
 "rpcs3.app/Contents/Frameworks/QtQml.framework" \
 "rpcs3.app/Contents/Frameworks/QtQmlModels.framework" \
 "rpcs3.app/Contents/Frameworks/QtQuick.framework" \
 "rpcs3.app/Contents/Frameworks/QtVirtualKeyboard.framework" \
 "rpcs3.app/Contents/Plugins/platforminputcontexts" \
-"rpcs3.app/Contents/Plugins/virtualkeyboard"
+"rpcs3.app/Contents/Plugins/virtualkeyboard" \
+"rpcs3.app/Contents/Resources/git"

 # Need to do this rename hack due to case insensitive filesystem
 mv rpcs3.app RPCS3_.app
@@ -33,7 +36,7 @@ echo "IconIndex=0" >> Quickstart.url

 DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.dmg"

-create-dmg --volname RPCS3 \
+/opt/homebrew/bin/create-dmg --volname RPCS3 \
 --window-size 800 400 \
 --icon-size 100 \
 --icon rpcs3.app 200 190 \
@@ -45,7 +48,7 @@ create-dmg --volname RPCS3 \
 "$DMG_FILEPATH" \
 RPCS3.app

-7z a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app
+/opt/homebrew/bin/7z a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app

 FILESIZE=$(stat -f %z "$DMG_FILEPATH")
 SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }')
@@ -5,6 +5,7 @@ ARTIFACT_DIR="$BUILD_ARTIFACTSTAGINGDIRECTORY"

 # Remove unecessary files
 rm -f ./bin/rpcs3.exp ./bin/rpcs3.lib ./bin/rpcs3.pdb ./bin/vc_redist.x64.exe
+rm -rf ./bin/git

 # Prepare compatibility database for packaging, as well as
 # certificate for ssl (auto-updater)
@@ -1,4 +1,4 @@
 #!/bin/sh -ex

-curl -L -o "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z.sha256"
+curl -L -o "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z.sha256"
 curl -L -o "./glslang.lock" "https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z.sha256"
@@ -9,7 +9,7 @@ export ASSUME_ALWAYS_YES=true
 pkg info # debug

 # Prefer newer Clang than in base system (see also .ci/build-freebsd.sh)
-pkg install llvm13
+pkg install llvm16

 # Mandatory dependencies (qt5-dbus and qt5-gui are pulled via qt5-widgets)
 pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent qt5-multimedia qt5-svg glew openal-soft ffmpeg
@@ -19,9 +19,9 @@ QT_DECL_URL="${QT_HOST}${QT_PREFIX}qtdeclarative${QT_SUFFIX}"
 QT_TOOL_URL="${QT_HOST}${QT_PREFIX}qttools${QT_SUFFIX}"
 QT_MM_URL="${QT_HOST}${QT_PREFIX}qtmultimedia${QT_SUFFIX}"
 QT_SVG_URL="${QT_HOST}${QT_PREFIX}qtsvg${QT_SUFFIX}"
-LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z'
+LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z'
 GLSLANG_URL='https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z'
-VULKAN_SDK_URL="https://www.dropbox.com/s/o918fc11pfk8x9c/VulkanSDK-${VULKAN_VER}-Installer.exe"
+VULKAN_SDK_URL="https://www.dropbox.com/s/cs77c3iv5mbo0bt/VulkanSDK-${VULKAN_VER}-Installer.exe"

 DEP_URLS="         \
    $QT_BASE_URL   \
@@ -40,7 +40,7 @@ DEP_URLS="         \
 # Pull all the submodules except llvm, since it is built separately and we just download that build
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
+git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/llvm/ && !/SPIRV/ { print $3 }' .gitmodules)

 # Git bash doesn't have rev, so here it is
 rev()
@@ -79,7 +79,7 @@ for url in $DEP_URLS; do
    # shellcheck disable=SC1003
    case "$url" in
    *qt*) checksum=$(curl -L "${url}.sha1"); algo="sha1"; outDir='C:\Qt\' ;;
-    *llvm*) checksum=$(curl -L "${url}.sha256"); algo="sha256"; outDir="." ;;
+    *llvm*) checksum=$(curl -L "${url}.sha256"); algo="sha256"; outDir="./3rdparty/llvm" ;;
    *glslang*) checksum=$(curl -L "${url}.sha256"); algo="sha256"; outDir="./lib/Release-x64" ;;
    *Vulkan*)
        # Vulkan setup needs to be run in batch environment
@@ -23,8 +23,8 @@ windows_task:
    QT_VER_MSVC: 'msvc2019'
    QT_DATE: '202011130602'
    QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
-    VULKAN_VER: '1.3.204.0'
-    VULKAN_SDK_SHA: '41f4996335cc5a545d7b2f6e5ff29cf3867789aae4be053a7069aa93408861fa'
+    VULKAN_VER: '1.3.224.1'
+    VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea'
    VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
    CACHE_DIR: "./cache"
    UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
@@ -61,7 +61,7 @@ windows_task:

 linux_task:
  container:
-    image: rpcs3/rpcs3-ci-bionic:1.3
+    image: rpcs3/rpcs3-ci-bionic:1.8
    cpu: 4
    memory: 16G
  env:
@@ -108,7 +108,7 @@ freebsd_task:
  matrix:
    - name: Cirrus FreeBSD
      freebsd_instance:
-        image_family: freebsd-13-0
+        image_family: freebsd-13-1
        cpu: 8
        memory: 8G
  env:
@@ -120,15 +120,17 @@ freebsd_task:
  script: "./.ci/build-freebsd.sh"

 macos_task:
-  timeout_in: 120m
+  timeout_in: 12000m
  ccache_cache:
    folder: /tmp/ccache_dir
  matrix:
    - name: Cirrus macOS
-      osx_instance:
-        image: monterey-xcode-13.3
+      macos_instance:
+        image: ghcr.io/cirruslabs/macos-monterey-xcode:14
      mac_script:
        - mkdir artifacts
+        - chmod +x ".ci/build-mac.sh"
+        - chmod +x ".ci/deploy-mac.sh"
        - ".ci/build-mac.sh"
  env:
    BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
@@ -141,7 +143,7 @@ macos_task:
    RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
  artifacts:
    name: Artifact
-    path: "artifacts/rpcs3-*_macos.*"
+    path: "artifacts/*"
  push_script: |
    if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
      source './.ci/export-cirrus-vars.sh'
@@ -21,7 +21,7 @@ Cpp11BracedListStyle: true
 IndentCaseLabels: false
 SortIncludes: false
 ReflowComments: true
-AlignConsecutiveAssignments: true
+AlignConsecutiveAssignments: false
 AlignTrailingComments: true
 AlignAfterOpenBracket: DontAlign
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
@@ -1,66 +0,0 @@
---
-name: Regression report
-about: If something used to work before, but now it doesn't
-title: ''
-labels: ''
-assignees: ''
-
---
-
-## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
-
-## Quick summary
-Please briefly describe what has stopped working correctly.
-
-## Details
-Please describe the regression as accurately as possible.
-
-#### 0. Make sure you're running with settings as close to default as possible
-* **Do NOT enable any emulator game patches when reporting issues**
-* Only change settings that are required for the game to work
-
-#### 1. Please provide _exact_ build (or commit) information that introduced the regression you're reporting.
-* Please see [How to find the build that caused a regression](https://wiki.rpcs3.net/index.php?title=Help:Using_different_versions_of_RPCS3#How_to_find_the_build_that_caused_a_regression.3F) in our wiki.
-* You can find [History of RPCS3 builds](https://rpcs3.net/compatibility?b) here.
-
-#### 2. Please attach TWO logs:
-* One for the build with regression.
-* One for the build that works as expected.
-
-##### How to obtain RPCS3's log:
-* Run the game until you find the regression.
-* Completely close RPCS3, or move to the next step in case it has crashed.
-* Locate RPCS3's log file:
-	+ ```RPCS3.log``` (It can show up as just RPCS3 and have a notepad icon)
-	or
-	+ ```RPCS3.log.gz``` (It can show up as RPCS3.log and have a zip or rar icon)
-![image](https://user-images.githubusercontent.com/44116740/84433247-aa15fa80-ac36-11ea-913e-6fe25a1d040e.png)
-	On Linux it will be in ```~/.cache/rpcs3/```.
-	On Windows it will be near the executable.
-* Attach the log:
-	+ Drag and drop your log file into the issue.
-	+ Or upload it to the cloud, such as Dropbox, Mega etc.
-
-#### 3. If you describe graphical regression, please provide an RSX capture and a RenderDoc capture that demonstrate it.
-* To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
-Captures will be stored in RPCS3 folder → captures.
-	+ Compress your capture with 7z, Rar etc.
-	And drag and drop it into the issue.
-	+ Or upload it to the cloud, such as Dropbox, Mega etc.
-* To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
-
-#### 4. Please attach screenshots of your problem.
-* Enable performance overlay with at least medium level of detail.
-You can find it in _Emulator_ tab in _Settings_.
-
-#### 5. Please provide comparison with real PS3.
-
-#### 6. Please provide your system configuration:
-* OS
-* CPU
-* GPU
-* Driver version
-* etc.
-
-#### Please include.
-* Anything else you deem to be important
@@ -0,0 +1,93 @@
+name: Regression report
+description: If something used to work before, but now it doesn't
+title: "[Regression] Enter a title here"
+labels: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Summary
+        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+  - type: textarea
+    id: quick-summary
+    attributes:
+      label: Quick summary
+      description: Please briefly describe what has stopped working correctly.
+    validations:
+      required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: Details
+      description: Please describe the regression as accurately as possible. Include screenshots if neccessary.
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        # Identify the regressed build
+        Please provide the _exact_ build (or commit) information that introduced the regression you're reporting.
+        * Please see [How to find the build that caused a regression](https://wiki.rpcs3.net/index.php?title=Help:Using_different_versions_of_RPCS3#How_to_find_the_build_that_caused_a_regression.3F) in our wiki.
+        * You can find [History of RPCS3 builds](https://rpcs3.net/compatibility?b) here.
+
+        Make sure you're running with settings as close to default as possible
+        * **Do NOT enable any emulator game patches when reporting issues**
+        * Only change settings that are required for the game to work
+  - type: input
+    id: regressed-build
+    attributes:
+      label: Build with regression
+      description: Provide _exact_ build (or commit) information that introduced the regression you're reporting.
+      placeholder: v0.0.23-13948-31df99f7
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Log files
+        Obtaining the log file:
+        * Run the game until you find the regression.
+        * Completely close RPCS3 and locate the log file.
+
+        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
+        * On Windows it will be in the RPCS3 directory near the executable
+        * On Linux it will be in ```~/.cache/rpcs3/```
+        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
+  - type: textarea
+    id: logs
+    attributes:
+      label: Attach two log files
+      description: |
+        Attach one file for the build with regression and another for a build that works.
+        Drag & drop the files into this input field, or upload them to another service (f.ex. Dropbox, Mega) and provide a link.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Other details
+        If you describe a graphical regression, please provide an RSX capture and/or a RenderDoc capture that demonstrate it.
+        * To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
+        * Captures will be stored in RPCS3 folder → captures.
+        * To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
+  - type: textarea
+    id: captures
+    attributes:
+      label: Attach capture files for visual issues
+      description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it.
+    validations:
+      required: false
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System configuration
+      description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration.
+    validations:
+      required: false
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      description: Include anything else you deem to be important.
+    validations:
+      required: false
@@ -1,59 +0,0 @@
---
-name: Bug report
-about: If something doesn't work correctly in RPCS3
-title: ''
-labels: ''
-assignees: ''
-
---
-
-## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
-
-## Quick summary
-Please briefly describe what is not working correctly.
-
-## Details
-
-Please describe the problem as accurately as possible.
-
-#### 0. Make sure you're running with settings as close to default as possible
-* **Do NOT enable any emulator game patches when reporting issues**
-* Only change settings that are required for the game to work
-
-#### 1. Please attach RPCS3's log.
-* Run the game until you find the issue.
-* Completely close RPCS3, or move to the next step in case it has crashed.
-* Locate RPCS3's log file:
-	+ ```RPCS3.log``` (It can show up as just RPCS3 and have a notepad icon)
-	or
-	+ ```RPCS3.log.gz``` (It can show up as RPCS3.log and have a zip or rar icon)
-![image](https://user-images.githubusercontent.com/44116740/84433247-aa15fa80-ac36-11ea-913e-6fe25a1d040e.png)
-	On Linux it will be in ```~/.cache/rpcs3/```.
-	On Windows it will be near the executable.
-* Attach the log:
-	+ Drag and drop your log file into the issue.
-	+ Or upload it to the cloud, such as Dropbox, Mega etc.
-
-#### 2. If you describe graphical issue, please provide an RSX capture and a RenderDoc capture that demonstrate it.
-* To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
-Captures will be stored in RPCS3 folder → captures.
-	+ Compress your capture with 7z, Rar etc.
-	And	drag and drop it into the issue.
-	+ Or upload it to the cloud, such as Dropbox, Mega etc.
-* To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
-
-#### 3. Please attach screenshots of your problem.
-* Enable performance overlay with at least medium level of detail.
-You can find it in _Emulator_ tab in _Settings_.
-
-#### 4. Please provide comparison with real PS3.
-
-#### 5. Please provide your system configuration:
-* OS
-* CPU
-* GPU
-* Driver version
-* etc.
-
-#### Please include.
-* Anything else you deem to be important
@@ -0,0 +1,78 @@
+name: Bug report
+description: If something doesn't work correctly in RPCS3
+title: "Enter a title here"
+labels: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Summary
+        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+  - type: textarea
+    id: quick-summary
+    attributes:
+      label: Quick summary
+      description: Please briefly describe what is not working correctly.
+    validations:
+      required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: Details
+      description: |
+        Please describe the problem as accurately as possible.
+        Provide a comparison with a real PS3, if possible.
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        # Log files
+
+        Provide a log file that includes the bug you're reporting.
+
+        Obtaining the log file:
+        * Run the game until you find the regression.
+        * Completely close RPCS3 and locate the log file.
+
+        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
+        * On Windows it will be in the RPCS3 directory near the executable
+        * On Linux it will be in ```~/.cache/rpcs3/```
+        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
+  - type: textarea
+    id: logs
+    attributes:
+      label: Attach a log file
+      description: |
+        Drag & drop the files into this input field, or upload them to another service (f.ex. Dropbox, Mega) and provide a link.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Other details
+        If you describe a graphical issue, please provide an RSX capture and/or a RenderDoc capture that demonstrate it.
+        * To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
+        * Captures will be stored in RPCS3 folder → captures.
+        * To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
+  - type: textarea
+    id: captures
+    attributes:
+      label: Attach capture files for visual issues
+      description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it.
+    validations:
+      required: false
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System configuration
+      description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration.
+    validations:
+      required: false
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      description: Include anything else you deem to be important.
+    validations:
+      required: false
@@ -1,41 +0,0 @@
---
-name: Feature Request
-about: If RPCS3 lacks a feature you would like to see
-title: '[Feature Request] Enter Feature Title Here'
-labels: ''
-assignees: ''
-
---
-
-## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
-
-## Quick summary
-Please briefly describe what feature you would like RPCS3 to have.
-
-## Details
-
-Please describe the feature as accurately as possible.
-
-#### 1. Please describe, what part of RPCS3 would be affected by your feature:
-* Gameplay
-* Debugging
-* UI
-* Patches
-* Installation
-* Github
-* CI
-* etc.
-
-#### 2. Please tell us, why your feature is important to RPCS3.
-
-#### 3. Please attach screenshots of the feature implemented in other projects.
-
-#### 4. Please provide your system configuration:
-* OS
-* CPU
-* GPU
-* Driver version
-* etc.
-
-#### Please include.
-* Anything else you deem to be important
@@ -0,0 +1,36 @@
+name: Feature request
+description: If RPCS3 lacks a feature you would like to see
+title: "[Feature request] Enter a title here"
+labels: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+  - type: textarea
+    id: quick-summary
+    attributes:
+      label: Quick summary
+      description: Please briefly describe what feature you would like RPCS3 to have.
+    validations:
+      required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: Details
+      description: Please describe the feature as accurately as possible.
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        Please include the following information:
+        * What part of RPCS3 would be affected by your feature? (Gameplay, Debugging, UI, Patches, Installation, CI etc.)
+        * Why your feature is important to RPCS3.
+        * If the feature is implemented in other projects, attach screenshots.
+        * If this feature is something that a game is trying to use, upload a log file for it.
+
+        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
+        * On Windows it will be in the RPCS3 directory near the executable
+        * On Linux it will be in ```~/.cache/rpcs3/```
+        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
@@ -0,0 +1,14 @@
+---
+name: Advanced
+about: For developers and experienced users only
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+
+You're using the advanced template. You're expected to know what to write in order to fill in all the required information for proper report.
+
+If you're unsure on what to do, please return back to the issue type selection and choose different category.
@@ -36,7 +36,6 @@
 /ipch
 /rpcs3/Debug
 /rpcs3/Release
-/llvm_build

 !/bin
 /bin/*
@@ -104,6 +103,7 @@ rpcs3/rpcs3_autogen/*

 # QtCreator
 CMakeLists.txt.user
+*.autosave

 # CLion
 /.idea/*
@@ -122,6 +122,15 @@ yaml-cpp.pc
 /3rdparty/libusb_cmake/config.h
 /3rdparty/libusb_cmake/libusb-1.0.pc

+# miniupnp
+/3rdparty/miniupnp/x64/*
+
+# llvm
+/3rdparty/llvm/llvm_build
+
+# legacy llvm
+/llvm_build
+
 # ssl certificate
 cacert.pem

@@ -7,9 +7,9 @@
 	url = ../../RPCS3/asmjit.git
 	branch = aarch64
 	ignore = dirty
-[submodule "llvm"]
-	path = llvm
-	url = ../../RPCS3/llvm-mirror.git
+[submodule "3rdparty/llvm/llvm"]
+	path = 3rdparty/llvm/llvm
+	url = ../../llvm/llvm-project.git
 	ignore = dirty
 [submodule "3rdparty/glslang"]
 	path = 3rdparty/glslang/glslang
@@ -76,3 +76,14 @@
 	path = 3rdparty/SoundTouch/soundtouch
 	url = ../../RPCS3/soundtouch.git
 	ignore = dirty
+[submodule "3rdparty/libsdl-org/SDL"]
+	path = 3rdparty/libsdl-org/SDL
+	url = ../../libsdl-org/SDL.git
+	ignore = dirty
+[submodule "3rdparty/miniupnp/miniupnp"]
+	path = 3rdparty/miniupnp/miniupnp
+	url = ../../miniupnp/miniupnp.git
+	ignore = dirty
+[submodule "3rdparty/rtmidi/rtmidi"]
+	path = 3rdparty/rtmidi/rtmidi
+	url = ../../thestk/rtmidi
@@ -1,5 +1,5 @@
 /* 7zTypes.h -- Basic types
-2021-12-25 : Igor Pavlov : Public domain */
+2022-04-01 : Igor Pavlov : Public domain */

 #ifndef __7Z_TYPES_H
 #define __7Z_TYPES_H
@@ -133,10 +133,6 @@ typedef int WRes;
 #define MY__E_ERROR_NEGATIVE_SEEK MY_HRESULT_FROM_errno_CONST_ERROR(EINVAL)
 */

-// gcc / clang : (sizeof(long) == sizeof(void*)) in 32/64 bits
-typedef          long INT_PTR;
-typedef unsigned long UINT_PTR;
-
 #define TEXT(quote) quote

 #define FILE_ATTRIBUTE_READONLY       0x0001
@@ -520,6 +516,14 @@ struct ISzAlloc

 #endif

+#define k_PropVar_TimePrec_0        0
+#define k_PropVar_TimePrec_Unix     1
+#define k_PropVar_TimePrec_DOS      2
+#define k_PropVar_TimePrec_HighPrec 3
+#define k_PropVar_TimePrec_Base     16
+#define k_PropVar_TimePrec_100ns (k_PropVar_TimePrec_Base + 7)
+#define k_PropVar_TimePrec_1ns   (k_PropVar_TimePrec_Base + 9)
+
 EXTERN_C_END

 #endif
@@ -1,7 +1,7 @@
-#define MY_VER_MAJOR 21
-#define MY_VER_MINOR 07
+#define MY_VER_MAJOR 22
+#define MY_VER_MINOR 01
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "21.07"
+#define MY_VERSION_NUMBERS "22.01"
 #define MY_VERSION MY_VERSION_NUMBERS

 #ifdef MY_CPU_NAME
@@ -10,12 +10,12 @@
  #define MY_VERSION_CPU MY_VERSION
 #endif

-#define MY_DATE "2021-12-26"
+#define MY_DATE "2022-07-15"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov"
 #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
-#define MY_COPYRIGHT_CR "Copyright (c) 1999-2021 Igor Pavlov"
+#define MY_COPYRIGHT_CR "Copyright (c) 1999-2022 Igor Pavlov"

 #ifdef USE_COPYRIGHT_CR
  #define MY_COPYRIGHT MY_COPYRIGHT_CR
@@ -1,5 +1,5 @@
 /* CpuArch.h -- CPU specific code
-2021-07-13 : Igor Pavlov : Public domain */
+2022-07-15 : Igor Pavlov : Public domain */

 #ifndef __CPU_ARCH_H
 #define __CPU_ARCH_H
@@ -123,12 +123,15 @@ MY_CPU_64BIT means that processor can work with 64-bit registers.
 #endif


-#if  defined(__sparc64__)
-  #define MY_CPU_NAME "sparc64"
-  #define MY_CPU_64BIT
-#elif defined(__sparc__)
-  #define MY_CPU_NAME "sparc"
-  /* #define MY_CPU_32BIT */
+#if  defined(__riscv) \
+  || defined(__riscv__)
+  #if __riscv_xlen == 32
+    #define MY_CPU_NAME "riscv32"
+  #elif __riscv_xlen == 64
+    #define MY_CPU_NAME "riscv64"
+  #else
+    #define MY_CPU_NAME "riscv"
+  #endif
 #endif


@@ -1,5 +1,5 @@
 /* DllSecur.c -- DLL loading security
-2021-12-25 : Igor Pavlov : Public domain */
+2022-07-15 : Igor Pavlov : Public domain */

 #include "Precomp.h"

@@ -11,6 +11,10 @@

 #ifndef UNDER_CE

+#if defined(__GNUC__) && (__GNUC__ >= 8)
+  #pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
 typedef BOOL (WINAPI *Func_SetDefaultDllDirectories)(DWORD DirectoryFlags);

 #define MY_LOAD_LIBRARY_SEARCH_USER_DIRS 0x400
@@ -34,7 +38,7 @@ static const char * const g_Dlls =
 #endif

 // #define MY_CAST_FUNC  (void(*)())
-#define MY_CAST_FUNC  
+#define MY_CAST_FUNC

 void My_SetDefaultDllDirectories()
 {
@@ -1,5 +1,5 @@
 /* LzmaEnc.c -- LZMA Encoder
-2021-11-18: Igor Pavlov : Public domain */
+2022-07-15: Igor Pavlov : Public domain */

 #include "Precomp.h"

@@ -2970,6 +2970,7 @@ const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
 }


+// (desiredPackSize == 0) is not allowed
 SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
 {
@@ -2990,14 +2991,10 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
  if (reInit)
    LzmaEnc_Init(p);
  LzmaEnc_InitPrices(p);
-
-  nowPos64 = p->nowPos64;
  RangeEnc_Init(&p->rc);
  p->rc.outStream = &outStream.vt;
-
-  if (desiredPackSize == 0)
-    return SZ_ERROR_OUTPUT_EOF;
-
+  nowPos64 = p->nowPos64;
+  
  res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
  
  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
@@ -78,7 +78,7 @@ add_subdirectory(hidapi)

 # Vulkan
 add_subdirectory(glslang EXCLUDE_FROM_ALL)
-add_subdirectory(SPIRV EXCLUDE_FROM_ALL)
+#add_subdirectory(SPIRV EXCLUDE_FROM_ALL)


 # yaml-cpp
@@ -142,7 +142,7 @@ add_subdirectory(SoundTouch EXCLUDE_FROM_ALL)
 # libevdev
 set(LIBEVDEV_TARGET 3rdparty_dummy_lib)
 if(USE_LIBEVDEV)
-	pkg_check_modules(LIBEVDEV libevdev)
+	pkg_check_modules(LIBEVDEV libevdev libudev)
 	if(LIBEVDEV_FOUND)
 		add_library(3rdparty_libevdev INTERFACE)
 		target_compile_definitions(3rdparty_libevdev INTERFACE -DHAVE_LIBEVDEV)
@@ -165,10 +165,10 @@ if(USE_VULKAN)
 			message("-- RPCS3: MoltenVK submodule")

 			execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-    				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK"
+				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK"
 			)
 			execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-   	 			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK"
+				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK"
 			)

 			add_library(moltenvk_lib SHARED IMPORTED)
@@ -189,7 +189,7 @@ if(USE_VULKAN)
 	if(VULKAN_FOUND)
 		add_library(3rdparty_vulkan INTERFACE)
 		target_compile_definitions(3rdparty_vulkan INTERFACE -DHAVE_VULKAN)
-		target_link_libraries(3rdparty_vulkan INTERFACE SPIRV SPIRV-Tools-opt Vulkan::Vulkan)
+		target_link_libraries(3rdparty_vulkan INTERFACE SPIRV Vulkan::Vulkan)

 		if(UNIX AND NOT APPLE)
 			find_package(Wayland)
@@ -222,21 +222,28 @@ set(FAUDIO_TARGET 3rdparty_dummy_lib)
 if(USE_FAUDIO)
 	# FAudio depends on SDL2
 	find_package(SDL2)
-	if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
-		message(WARNING
-			"-- RPCS3: FAudio requires SDL 2.0.9 or newer. Please note, this warning"
-			"can also be displayed with SDL2 versions between 2.0.9-2.0.12, as the"
-			"CMake config files are not correctly installed. Since a valid SDL2"
-			">=2.0.9 version cannot be found, building with FAudio will be skipped.")
-		set(USE_FAUDIO False)
-	else()
-		if (USE_SYSTEM_FAUDIO)
+	if (USE_SYSTEM_FAUDIO)
+		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
+			message(WARNING
+				"-- RPCS3: System FAudio requires SDL 2.0.9 or newer. Please note, this warning"
+				"can also be displayed with SDL2 versions between 2.0.9-2.0.12, as the"
+				"CMake config files are not correctly installed. Since a valid SDL2"
+				">=2.0.9 version cannot be found, building with FAudio will be skipped.")
+			set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 2.0.12" FORCE)
+		else()
 			message(STATUS "RPCS3: Using system FAudio")
 			find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake)
 			add_library(3rdparty_FAudio INTERFACE)
 			target_link_libraries(3rdparty_FAudio INTERFACE FAudio)
 			target_compile_definitions(3rdparty_FAudio INTERFACE -DHAVE_FAUDIO)
 			set(FAUDIO_TARGET 3rdparty_FAudio)
+		endif()
+	else()
+		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.24.0)
+			message(WARNING
+				"-- RPCS3: 3rdparty FAudio requires SDL 2.24.0 or newer. Since a valid SDL2"
+				">=2.24.0 version cannot be found, building with FAudio will be skipped.")
+			set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 2.24.0" FORCE)
 		else()
 			message(STATUS "RPCS3: Using builtin FAudio")
 			set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
@@ -329,6 +336,36 @@ add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
 # CURL
 add_subdirectory(curl EXCLUDE_FROM_ALL)

+# SDL2
+set(SDL2_TARGET 3rdparty_dummy_lib)
+if(USE_SDL)
+	if(USE_SYSTEM_SDL)
+		find_package(SDL2)
+		if(SDL2_FOUND AND NOT SDL2_VERSION VERSION_LESS 2.24.0)
+			message(STATUS "Using system SDL2")
+			add_library(3rdparty_sdl2 INTERFACE)
+			target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
+			target_include_directories(3rdparty_sdl2 INTERFACE ${SDL2_INCLUDE_DIRS})
+			target_link_libraries(3rdparty_sdl2 INTERFACE ${SDL2_LIBRARIES})
+			set(SDL2_TARGET 3rdparty_sdl2)
+		else()
+			message(FATAL_ERROR "SDL2 is not available on this system")
+		endif()
+	else()
+		message(STATUS "Using static SDL2 from 3rdparty")
+		add_library(3rdparty_sdl2 INTERFACE)
+		target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
+		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
+		set(SDL2_TARGET 3rdparty_sdl2)
+	endif()
+endif()
+
+# MINIUPNP
+add_subdirectory(miniupnp EXCLUDE_FROM_ALL)
+
+# RTMIDI
+add_subdirectory(rtmidi EXCLUDE_FROM_ALL)
+
 # add nice ALIAS targets for ease of use
 if(USE_SYSTEM_LIBUSB)
 	add_library(3rdparty::libusb ALIAS usb-1.0-shared)
@@ -355,3 +392,6 @@ add_library(3rdparty::glew ALIAS 3rdparty_glew)
 add_library(3rdparty::wolfssl ALIAS wolfssl)
 add_library(3rdparty::libcurl ALIAS libcurl)
 add_library(3rdparty::soundtouch ALIAS soundtouch)
+add_library(3rdparty::sdl2 ALIAS ${SDL2_TARGET})
+add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static)
+add_library(3rdparty::rtmidi ALIAS rtmidi)
@@ -153,6 +153,20 @@ typedef int64_t                 khronos_int64_t;
 typedef uint64_t                khronos_uint64_t;
 #define KHRONOS_SUPPORT_INT64   1
 #define KHRONOS_SUPPORT_FLOAT   1
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif

 #elif defined(__VMS ) || defined(__sgi)

@@ -235,14 +249,21 @@ typedef unsigned short int     khronos_uint16_t;
 * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
 * to be the only LLP64 architecture in current use.
 */
-#ifdef _WIN64
+#ifdef KHRONOS_USE_INTPTR_T
+typedef intptr_t               khronos_intptr_t;
+typedef uintptr_t              khronos_uintptr_t;
+#elif defined(_WIN64)
 typedef signed   long long int khronos_intptr_t;
 typedef unsigned long long int khronos_uintptr_t;
-typedef signed   long long int khronos_ssize_t;
-typedef unsigned long long int khronos_usize_t;
 #else
 typedef signed   long  int     khronos_intptr_t;
 typedef unsigned long  int     khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
 typedef signed   long  int     khronos_ssize_t;
 typedef unsigned long  int     khronos_usize_t;
 #endif
@@ -32,9 +32,9 @@ extern "C" {
 #define GLAPI extern
 #endif

-#define GL_GLEXT_VERSION 20210420
+#define GL_GLEXT_VERSION 20220530

-#include "khrplatform.h"
+#include <KHR/khrplatform.h>

 /* Generated C header for:
 * API: gl
@@ -8214,6 +8214,10 @@ GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
 #define GL_EXT_shader_integer_mix 1
 #endif /* GL_EXT_shader_integer_mix */

+#ifndef GL_EXT_shader_samples_identical
+#define GL_EXT_shader_samples_identical 1
+#endif /* GL_EXT_shader_samples_identical */
+
 #ifndef GL_EXT_shadow_funcs
 #define GL_EXT_shadow_funcs 1
 #endif /* GL_EXT_shadow_funcs */
@@ -8625,6 +8629,36 @@ GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
 #define GL_RGBA_SNORM                     0x8F93
 #endif /* GL_EXT_texture_snorm */

+#ifndef GL_EXT_texture_storage
+#define GL_EXT_texture_storage 1
+#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT   0x912F
+#define GL_RGBA32F_EXT                    0x8814
+#define GL_RGB32F_EXT                     0x8815
+#define GL_ALPHA32F_EXT                   0x8816
+#define GL_LUMINANCE32F_EXT               0x8818
+#define GL_LUMINANCE_ALPHA32F_EXT         0x8819
+#define GL_RGBA16F_EXT                    0x881A
+#define GL_RGB16F_EXT                     0x881B
+#define GL_ALPHA16F_EXT                   0x881C
+#define GL_LUMINANCE16F_EXT               0x881E
+#define GL_LUMINANCE_ALPHA16F_EXT         0x881F
+#define GL_BGRA8_EXT                      0x93A1
+#define GL_R8_EXT                         0x8229
+#define GL_RG8_EXT                        0x822B
+#define GL_R32F_EXT                       0x822E
+#define GL_RG32F_EXT                      0x8230
+#define GL_R16F_EXT                       0x822D
+#define GL_RG16F_EXT                      0x822F
+typedef void (APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+#endif /* GL_EXT_texture_storage */
+
 #ifndef GL_EXT_texture_swizzle
 #define GL_EXT_texture_swizzle 1
 #define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
@@ -747,12 +747,12 @@ AF1 sharpness){
  // Immediate constants for peak range.
  AF2 peakC=AF2(1.0,-1.0*4.0);
  // Limiters, these need to be high precision RCPs.
-  AF1 hitMinR=mn4R*ARcpF1(AF1_(4.0)*mx4R);
-  AF1 hitMinG=mn4G*ARcpF1(AF1_(4.0)*mx4G);
-  AF1 hitMinB=mn4B*ARcpF1(AF1_(4.0)*mx4B);
-  AF1 hitMaxR=(peakC.x-mx4R)*ARcpF1(AF1_(4.0)*mn4R+peakC.y);
-  AF1 hitMaxG=(peakC.x-mx4G)*ARcpF1(AF1_(4.0)*mn4G+peakC.y);
-  AF1 hitMaxB=(peakC.x-mx4B)*ARcpF1(AF1_(4.0)*mn4B+peakC.y);
+  AF1 hitMinR=min(mn4R,eR)*ARcpF1(AF1_(4.0)*mx4R);
+  AF1 hitMinG=min(mn4G,eG)*ARcpF1(AF1_(4.0)*mx4G);
+  AF1 hitMinB=min(mn4B,eB)*ARcpF1(AF1_(4.0)*mx4B);
+  AF1 hitMaxR=(peakC.x-max(mx4R,eR))*ARcpF1(AF1_(4.0)*mn4R+peakC.y);
+  AF1 hitMaxG=(peakC.x-max(mx4G,eG))*ARcpF1(AF1_(4.0)*mn4G+peakC.y);
+  AF1 hitMaxB=(peakC.x-max(mx4B,eB))*ARcpF1(AF1_(4.0)*mn4B+peakC.y);
  AF1 lobeR=max(-hitMinR,hitMaxR);
  AF1 lobeG=max(-hitMinG,hitMaxG);
  AF1 lobeB=max(-hitMinB,hitMaxB);
@@ -845,12 +845,12 @@ AF1 sharpness){
  // Immediate constants for peak range.
  AH2 peakC=AH2(1.0,-1.0*4.0);
  // Limiters, these need to be high precision RCPs.
-  AH1 hitMinR=mn4R*ARcpH1(AH1_(4.0)*mx4R);
-  AH1 hitMinG=mn4G*ARcpH1(AH1_(4.0)*mx4G);
-  AH1 hitMinB=mn4B*ARcpH1(AH1_(4.0)*mx4B);
-  AH1 hitMaxR=(peakC.x-mx4R)*ARcpH1(AH1_(4.0)*mn4R+peakC.y);
-  AH1 hitMaxG=(peakC.x-mx4G)*ARcpH1(AH1_(4.0)*mn4G+peakC.y);
-  AH1 hitMaxB=(peakC.x-mx4B)*ARcpH1(AH1_(4.0)*mn4B+peakC.y);
+  AH1 hitMinR=min(mn4R,eR)*ARcpH1(AH1_(4.0)*mx4R);
+  AH1 hitMinG=min(mn4G,eG)*ARcpH1(AH1_(4.0)*mx4G);
+  AH1 hitMinB=min(mn4B,eB)*ARcpH1(AH1_(4.0)*mx4B);
+  AH1 hitMaxR=(peakC.x-max(mx4R,eR))*ARcpH1(AH1_(4.0)*mn4R+peakC.y);
+  AH1 hitMaxG=(peakC.x-max(mx4G,eG))*ARcpH1(AH1_(4.0)*mn4G+peakC.y);
+  AH1 hitMaxB=(peakC.x-max(mx4B,eB))*ARcpH1(AH1_(4.0)*mn4B+peakC.y);
  AH1 lobeR=max(-hitMinR,hitMaxR);
  AH1 lobeG=max(-hitMinG,hitMaxG);
  AH1 lobeB=max(-hitMinB,hitMaxB);
@@ -963,12 +963,12 @@ AF1 sharpness){
  // Immediate constants for peak range.
  AH2 peakC=AH2(1.0,-1.0*4.0);
  // Limiters, these need to be high precision RCPs.
-  AH2 hitMinR=mn4R*ARcpH2(AH2_(4.0)*mx4R);
-  AH2 hitMinG=mn4G*ARcpH2(AH2_(4.0)*mx4G);
-  AH2 hitMinB=mn4B*ARcpH2(AH2_(4.0)*mx4B);
-  AH2 hitMaxR=(peakC.x-mx4R)*ARcpH2(AH2_(4.0)*mn4R+peakC.y);
-  AH2 hitMaxG=(peakC.x-mx4G)*ARcpH2(AH2_(4.0)*mn4G+peakC.y);
-  AH2 hitMaxB=(peakC.x-mx4B)*ARcpH2(AH2_(4.0)*mn4B+peakC.y);
+  AH2 hitMinR=min(mn4R,eR)*ARcpH2(AH2_(4.0)*mx4R);
+  AH2 hitMinG=min(mn4G,eG)*ARcpH2(AH2_(4.0)*mx4G);
+  AH2 hitMinB=min(mn4B,eB)*ARcpH2(AH2_(4.0)*mx4B);
+  AH2 hitMaxR=(peakC.x-max(mx4R,eR))*ARcpH2(AH2_(4.0)*mn4R+peakC.y);
+  AH2 hitMaxG=(peakC.x-max(mx4G,eG))*ARcpH2(AH2_(4.0)*mn4G+peakC.y);
+  AH2 hitMaxB=(peakC.x-max(mx4B,eB))*ARcpH2(AH2_(4.0)*mn4B+peakC.y);
  AH2 lobeR=max(-hitMinR,hitMaxR);
  AH2 lobeG=max(-hitMinG,hitMaxG);
  AH2 lobeB=max(-hitMinB,hitMaxB);
@@ -4,7 +4,7 @@ include(ExternalProject)

 ExternalProject_Add(moltenvk
 	GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
-	GIT_TAG 1236d2f
+	GIT_TAG 4c6bfbe
 	BUILD_IN_SOURCE 1
 	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK
 	CONFIGURE_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/fetchDependencies" --macos
@@ -1,7 +0,0 @@
-diff --git a/ExternalRevisions/SPIRV-Cross_repo_revision b/ExternalRevisions/SPIRV-Cross_repo_revision
-index 777346a0..c1971b45 100644
--- a/ExternalRevisions/SPIRV-Cross_repo_revision
-+++ b/ExternalRevisions/SPIRV-Cross_repo_revision
-@@ -1 +1 @@
-0d4ce028bf8b8a94d325dc1e1c20446153ba19c4
-+44c3333a1c315ead00c24f7aef5fa8a7ccf49299
@@ -39,28 +39,28 @@
  <PropertyGroup Label="UserMacros">
    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers').Replace('\', '/')) SPIRV-Tools -B build</CmakeReleaseCLI>
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers').Replace('\', '/'))" SPIRV-Tools -B build</CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers').Replace('\', '/')) -S SPIRV-Tools -B build</CmakeDebugCLI>
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers').Replace('\', '/'))" -S SPIRV-Tools -B build</CmakeDebugCLI>
    <PropsAbsPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\buildfiles\msvc\common_default.props'))</PropsAbsPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeBuildCommandLine>
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeReBuildCommandLine>
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeCleanCommandLine>
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <NMakeBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemDefinitionGroup>
@@ -68,4 +68,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
@@ -27,7 +27,7 @@ target_compile_definitions(soundtouch PUBLIC
 	SOUNDTOUCH_FLOAT_SAMPLES;
 )

-target_compile_options(soundtouch PUBLIC "-w")
+target_compile_options(soundtouch PRIVATE "-w")

 if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86|X86|amd64|AMD64|em64t|EM64T)")
 	target_compile_definitions(soundtouch PUBLIC
@@ -70,6 +70,7 @@
      <PreprocessorDefinitions>SOUNDTOUCH_ALLOW_SSE;ST_NO_EXCEPTION_HANDLING;USE_MULTICH_ALWAYS;SOUNDTOUCH_FLOAT_SAMPLES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>./soundtouch/source/SoundTouch;./soundtouch/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
    </ClCompile>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -62,12 +62,13 @@
    <ClCompile Include="asmjit\src\asmjit\arm\a64builder.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64compiler.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64emithelper.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\arm\a64formatter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\arm\a64func.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64instapi.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64instdb.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64operand.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64rapass.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\armformatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\armfunc.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="asmjit\src\asmjit\core\api-build_p.h" />
@@ -134,11 +135,14 @@
    <ClInclude Include="asmjit\src\asmjit\x86\x86opcode_p.h" />
    <ClInclude Include="asmjit\src\asmjit\x86\x86operand.h" />
    <ClInclude Include="asmjit\src\asmjit\x86\x86rapass_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\arm\a64archtraits_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64assembler.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64builder.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64compiler.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64emithelper_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64emitter.h" />
+    <ClInclude Include="asmjit\src\asmjit\arm\a64formatter_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\arm\a64func_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64globals.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64instapi_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64instdb.h" />
@@ -146,9 +150,7 @@
    <ClInclude Include="asmjit\src\asmjit\arm\a64operand.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64rapass_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64utils.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armarchtraits_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\armformatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armfunc_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\armglobals.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\armoperand.h" />
  </ItemGroup>
@@ -185,6 +187,7 @@
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
      <PreprocessorDefinitions>ASMJIT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
    </ClCompile>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -52,12 +52,13 @@
    <ClCompile Include="asmjit\src\asmjit\arm\a64builder.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64compiler.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64emithelper.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\arm\a64formatter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\arm\a64func.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64instapi.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64instdb.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64operand.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\a64rapass.cpp" />
    <ClCompile Include="asmjit\src\asmjit\arm\armformatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\armfunc.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="asmjit\src\asmjit\core\api-build_p.h" />
@@ -124,11 +125,14 @@
    <ClInclude Include="asmjit\src\asmjit\x86\x86opcode_p.h" />
    <ClInclude Include="asmjit\src\asmjit\x86\x86operand.h" />
    <ClInclude Include="asmjit\src\asmjit\x86\x86rapass_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\arm\a64archtraits_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64assembler.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64builder.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64compiler.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64emithelper_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64emitter.h" />
+    <ClInclude Include="asmjit\src\asmjit\arm\a64formatter_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\arm\a64func_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64globals.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64instapi_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64instdb.h" />
@@ -136,9 +140,7 @@
    <ClInclude Include="asmjit\src\asmjit\arm\a64operand.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64rapass_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\a64utils.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armarchtraits_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\armformatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armfunc_p.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\armglobals.h" />
    <ClInclude Include="asmjit\src\asmjit\arm\armoperand.h" />
  </ItemGroup>
@@ -79,6 +79,7 @@
      <SDLCheck>false</SDLCheck>
      <PreprocessorDefinitions>OUTSIDE_SPEEX;RANDOM_PREFIX=speex;FLOATING_POINT;_USE_SSE;_USE_SSE2;EXPORT=;USE_WASAPI;USE_WINMM;CUBEB_WASAPI_USE_IAUDIOSTREAMVOLUME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>./cubeb/subprojects/;./extra/;./cubeb/src/;./cubeb/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
    </ClCompile>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -12,6 +12,7 @@ else()
 	option(CURL_USE_WOLFSSL "enable wolfSSL for SSL/TLS" ON)
 	option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" ON)
 	option(CURL_ZLIB "Set to ON to enable building curl with zlib support." OFF)
+	option(USE_LIBIDN2 "Use libidn2 for IDN support" OFF) # Disabled because MacOs CI doesn't work otherwise
 	set(CURL_CA_PATH "none" CACHE STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
 	if(USE_MSVC_STATIC_CRT)
 		set(CURL_STATIC_CRT ON CACHE BOOL "Use static crt to build curl" FORCE)
@@ -64,20 +64,27 @@
    <ClCompile Include="curl\lib\asyn-ares.c" />
    <ClCompile Include="curl\lib\asyn-thread.c" />
    <ClCompile Include="curl\lib\base64.c" />
+    <ClCompile Include="curl\lib\bufq.c" />
    <ClCompile Include="curl\lib\bufref.c" />
    <ClCompile Include="curl\lib\c-hyper.c" />
+    <ClCompile Include="curl\lib\cf-h1-proxy.c" />
+    <ClCompile Include="curl\lib\cf-h2-proxy.c" />
+    <ClCompile Include="curl\lib\cf-haproxy.c" />
+    <ClCompile Include="curl\lib\cf-https-connect.c" />
+    <ClCompile Include="curl\lib\cf-socket.c" />
+    <ClCompile Include="curl\lib\cfilters.c" />
    <ClCompile Include="curl\lib\conncache.c" />
    <ClCompile Include="curl\lib\connect.c" />
    <ClCompile Include="curl\lib\content_encoding.c" />
    <ClCompile Include="curl\lib\cookie.c" />
    <ClCompile Include="curl\lib\curl_addrinfo.c" />
-    <ClCompile Include="curl\lib\curl_ctype.c" />
    <ClCompile Include="curl\lib\curl_des.c" />
    <ClCompile Include="curl\lib\curl_endian.c" />
    <ClCompile Include="curl\lib\curl_fnmatch.c" />
    <ClCompile Include="curl\lib\curl_gethostname.c" />
    <ClCompile Include="curl\lib\curl_get_line.c" />
    <ClCompile Include="curl\lib\curl_gssapi.c" />
+    <ClCompile Include="curl\lib\curl_log.c" />
    <ClCompile Include="curl\lib\curl_memrchr.c" />
    <ClCompile Include="curl\lib\curl_multibyte.c" />
    <ClCompile Include="curl\lib\curl_ntlm_core.c" />
@@ -90,21 +97,21 @@
    <ClCompile Include="curl\lib\curl_threads.c" />
    <ClCompile Include="curl\lib\dict.c" />
    <ClCompile Include="curl\lib\doh.c" />
-    <ClCompile Include="curl\lib\dotdot.c" />
    <ClCompile Include="curl\lib\dynbuf.c" />
+    <ClCompile Include="curl\lib\dynhds.c" />
    <ClCompile Include="curl\lib\easy.c" />
    <ClCompile Include="curl\lib\easygetopt.c" />
    <ClCompile Include="curl\lib\easyoptions.c" />
    <ClCompile Include="curl\lib\escape.c" />
    <ClCompile Include="curl\lib\file.c" />
    <ClCompile Include="curl\lib\fileinfo.c" />
+    <ClCompile Include="curl\lib\fopen.c" />
    <ClCompile Include="curl\lib\formdata.c" />
    <ClCompile Include="curl\lib\ftp.c" />
    <ClCompile Include="curl\lib\ftplistparser.c" />
    <ClCompile Include="curl\lib\getenv.c" />
    <ClCompile Include="curl\lib\getinfo.c" />
    <ClCompile Include="curl\lib\gopher.c" />
-    <ClCompile Include="curl\lib\h2h3.c" />
    <ClCompile Include="curl\lib\hash.c" />
    <ClCompile Include="curl\lib\headers.c" />
    <ClCompile Include="curl\lib\hmac.c" />
@@ -115,6 +122,7 @@
    <ClCompile Include="curl\lib\hostsyn.c" />
    <ClCompile Include="curl\lib\hsts.c" />
    <ClCompile Include="curl\lib\http.c" />
+    <ClCompile Include="curl\lib\http1.c" />
    <ClCompile Include="curl\lib\http2.c" />
    <ClCompile Include="curl\lib\http_aws_sigv4.c" />
    <ClCompile Include="curl\lib\http_chunks.c" />
@@ -122,7 +130,7 @@
    <ClCompile Include="curl\lib\http_negotiate.c" />
    <ClCompile Include="curl\lib\http_ntlm.c" />
    <ClCompile Include="curl\lib\http_proxy.c" />
-    <ClCompile Include="curl\lib\idn_win32.c" />
+    <ClCompile Include="curl\lib\idn.c" />
    <ClCompile Include="curl\lib\if2ip.c" />
    <ClCompile Include="curl\lib\imap.c" />
    <ClCompile Include="curl\lib\inet_ntop.c" />
@@ -139,6 +147,7 @@
    <ClCompile Include="curl\lib\multi.c" />
    <ClCompile Include="curl\lib\netrc.c" />
    <ClCompile Include="curl\lib\nonblock.c" />
+    <ClCompile Include="curl\lib\noproxy.c" />
    <ClCompile Include="curl\lib\openldap.c" />
    <ClCompile Include="curl\lib\parsedate.c" />
    <ClCompile Include="curl\lib\pingpong.c" />
@@ -178,11 +187,13 @@
    <ClCompile Include="curl\lib\vauth\gsasl.c" />
    <ClCompile Include="curl\lib\version.c" />
    <ClCompile Include="curl\lib\version_win32.c" />
+    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
+    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
+    <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
    <ClCompile Include="curl\lib\vtls\hostcheck.c" />
    <ClCompile Include="curl\lib\vtls\rustls.c" />
    <ClCompile Include="curl\lib\vtls\x509asn1.c" />
    <ClCompile Include="curl\lib\warnless.c" />
-    <ClCompile Include="curl\lib\wildcard.c" />
    <ClCompile Include="curl\lib\vauth\cleartext.c" />
    <ClCompile Include="curl\lib\vauth\cram.c" />
    <ClCompile Include="curl\lib\vauth\digest.c" />
@@ -195,8 +206,6 @@
    <ClCompile Include="curl\lib\vauth\spnego_gssapi.c" />
    <ClCompile Include="curl\lib\vauth\spnego_sspi.c" />
    <ClCompile Include="curl\lib\vauth\vauth.c" />
-    <ClCompile Include="curl\lib\vquic\ngtcp2.c" />
-    <ClCompile Include="curl\lib\vquic\quiche.c" />
    <ClCompile Include="curl\lib\vquic\vquic.c" />
    <ClCompile Include="curl\lib\vssh\libssh.c" />
    <ClCompile Include="curl\lib\vssh\libssh2.c" />
@@ -214,6 +223,7 @@
    <ClCompile Include="curl\lib\vtls\sectransp.c" />
    <ClCompile Include="curl\lib\vtls\vtls.c" />
    <ClCompile Include="curl\lib\vtls\wolfssl.c" />
+    <ClCompile Include="curl\lib\ws.c" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="curl\include\curl\curl.h" />
@@ -229,8 +239,15 @@
    <ClInclude Include="curl\lib\amigaos.h" />
    <ClInclude Include="curl\lib\arpa_telnet.h" />
    <ClInclude Include="curl\lib\asyn.h" />
+    <ClInclude Include="curl\lib\bufq.h" />
    <ClInclude Include="curl\lib\bufref.h" />
    <ClInclude Include="curl\lib\c-hyper.h" />
+    <ClInclude Include="curl\lib\cf-h1-proxy.h" />
+    <ClInclude Include="curl\lib\cf-h2-proxy.h" />
+    <ClInclude Include="curl\lib\cf-haproxy.h" />
+    <ClInclude Include="curl\lib\cf-https-connect.h" />
+    <ClInclude Include="curl\lib\cf-socket.h" />
+    <ClInclude Include="curl\lib\cfilters.h" />
    <ClInclude Include="curl\lib\config-amigaos.h" />
    <ClInclude Include="curl\lib\config-dos.h" />
    <ClInclude Include="curl\lib\config-mac.h" />
@@ -256,6 +273,7 @@
    <ClInclude Include="curl\lib\curl_hmac.h" />
    <ClInclude Include="curl\lib\curl_krb5.h" />
    <ClInclude Include="curl\lib\curl_ldap.h" />
+    <ClInclude Include="curl\lib\curl_log.h" />
    <ClInclude Include="curl\lib\curl_md4.h" />
    <ClInclude Include="curl\lib\curl_md5.h" />
    <ClInclude Include="curl\lib\curl_memory.h" />
@@ -277,22 +295,26 @@
    <ClInclude Include="curl\lib\doh.h" />
    <ClInclude Include="curl\lib\dotdot.h" />
    <ClInclude Include="curl\lib\dynbuf.h" />
+    <ClInclude Include="curl\lib\dynhds.h" />
    <ClInclude Include="curl\lib\easyif.h" />
    <ClInclude Include="curl\lib\easyoptions.h" />
+    <ClInclude Include="curl\lib\easy_lock.h" />
    <ClInclude Include="curl\lib\escape.h" />
    <ClInclude Include="curl\lib\file.h" />
    <ClInclude Include="curl\lib\fileinfo.h" />
+    <ClInclude Include="curl\lib\fopen.h" />
    <ClInclude Include="curl\lib\formdata.h" />
    <ClInclude Include="curl\lib\ftp.h" />
    <ClInclude Include="curl\lib\ftplistparser.h" />
+    <ClInclude Include="curl\lib\functypes.h" />
    <ClInclude Include="curl\lib\getinfo.h" />
    <ClInclude Include="curl\lib\gopher.h" />
-    <ClInclude Include="curl\lib\h2h3.h" />
    <ClInclude Include="curl\lib\hash.h" />
    <ClInclude Include="curl\lib\headers.h" />
    <ClInclude Include="curl\lib\hostip.h" />
    <ClInclude Include="curl\lib\hsts.h" />
    <ClInclude Include="curl\lib\http.h" />
+    <ClInclude Include="curl\lib\http1.h" />
    <ClInclude Include="curl\lib\http2.h" />
    <ClInclude Include="curl\lib\http_aws_sigv4.h" />
    <ClInclude Include="curl\lib\http_chunks.h" />
@@ -300,6 +322,7 @@
    <ClInclude Include="curl\lib\http_negotiate.h" />
    <ClInclude Include="curl\lib\http_ntlm.h" />
    <ClInclude Include="curl\lib\http_proxy.h" />
+    <ClInclude Include="curl\lib\idn.h" />
    <ClInclude Include="curl\lib\if2ip.h" />
    <ClInclude Include="curl\lib\imap.h" />
    <ClInclude Include="curl\lib\inet_ntop.h" />
@@ -312,12 +335,12 @@
    <ClInclude Include="curl\lib\multiif.h" />
    <ClInclude Include="curl\lib\netrc.h" />
    <ClInclude Include="curl\lib\nonblock.h" />
+    <ClInclude Include="curl\lib\noproxy.h" />
    <ClInclude Include="curl\lib\parsedate.h" />
    <ClInclude Include="curl\lib\pingpong.h" />
    <ClInclude Include="curl\lib\pop3.h" />
    <ClInclude Include="curl\lib\progress.h" />
    <ClInclude Include="curl\lib\psl.h" />
-    <ClInclude Include="curl\lib\quic.h" />
    <ClInclude Include="curl\lib\rand.h" />
    <ClInclude Include="curl\lib\rename.h" />
    <ClInclude Include="curl\lib\rtsp.h" />
@@ -352,16 +375,17 @@
    <ClInclude Include="curl\lib\urlapi-int.h" />
    <ClInclude Include="curl\lib\urldata.h" />
    <ClInclude Include="curl\lib\version_win32.h" />
+    <ClInclude Include="curl\lib\vquic\curl_msh3.h" />
+    <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h" />
+    <ClInclude Include="curl\lib\vquic\curl_quiche.h" />
+    <ClInclude Include="curl\lib\vquic\vquic_int.h" />
    <ClInclude Include="curl\lib\vtls\hostcheck.h" />
    <ClInclude Include="curl\lib\vtls\rustls.h" />
    <ClInclude Include="curl\lib\vtls\x509asn1.h" />
    <ClInclude Include="curl\lib\warnless.h" />
-    <ClInclude Include="curl\lib\wildcard.h" />
    <ClInclude Include="curl\lib\vauth\digest.h" />
    <ClInclude Include="curl\lib\vauth\ntlm.h" />
    <ClInclude Include="curl\lib\vauth\vauth.h" />
-    <ClInclude Include="curl\lib\vquic\ngtcp2.h" />
-    <ClInclude Include="curl\lib\vquic\quiche.h" />
    <ClInclude Include="curl\lib\vquic\vquic.h" />
    <ClInclude Include="curl\lib\vssh\ssh.h" />
    <ClInclude Include="curl\lib\vssh\wolfssh.h" />
@@ -377,6 +401,7 @@
    <ClInclude Include="curl\lib\vtls\sectransp.h" />
    <ClInclude Include="curl\lib\vtls\vtls.h" />
    <ClInclude Include="curl\lib\vtls\wolfssl.h" />
+    <ClInclude Include="curl\lib\ws.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="curl\lib\libcurl.rc" />
@@ -48,9 +48,6 @@
    <ClCompile Include="curl\lib\curl_addrinfo.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\curl_ctype.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\curl_des.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -105,9 +102,6 @@
    <ClCompile Include="curl\lib\doh.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\dotdot.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\easy.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -180,9 +174,6 @@
    <ClCompile Include="curl\lib\http_proxy.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\idn_win32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\if2ip.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -339,9 +330,6 @@
    <ClCompile Include="curl\lib\warnless.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\wildcard.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\vauth\cleartext.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -378,12 +366,6 @@
    <ClCompile Include="curl\lib\vauth\vauth.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\vquic\ngtcp2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vquic\quiche.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\vssh\libssh.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -465,9 +447,6 @@
    <ClCompile Include="curl\lib\vauth\gsasl.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\h2h3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\vtls\hostcheck.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -480,6 +459,57 @@
    <ClCompile Include="curl\lib\timediff.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\fopen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\noproxy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\ws.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cfilters.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\idn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_log.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cf-https-connect.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cf-socket.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vquic\curl_msh3.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vquic\curl_quiche.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\http1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\dynhds.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\bufq.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cf-h1-proxy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cf-h2-proxy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cf-haproxy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="curl\include\curl\curl.h">
@@ -758,9 +788,6 @@
    <ClInclude Include="curl\lib\psl.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\quic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\rand.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -857,9 +884,6 @@
    <ClInclude Include="curl\lib\warnless.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\wildcard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\vauth\digest.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -869,12 +893,6 @@
    <ClInclude Include="curl\lib\vauth\vauth.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\vquic\ngtcp2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vquic\quiche.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\vssh\ssh.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -950,9 +968,6 @@
    <ClInclude Include="curl\lib\vtls\rustls.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\h2h3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\vtls\hostcheck.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -965,6 +980,66 @@
    <ClInclude Include="curl\lib\timediff.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\easy_lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\fopen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\functypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\noproxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\ws.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cfilters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\idn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cf-https-connect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cf-socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vquic\curl_msh3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vquic\curl_quiche.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vquic\vquic_int.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\dynhds.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\bufq.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cf-h1-proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cf-h2-proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cf-haproxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="curl\lib\libcurl.rc">
@@ -46,21 +46,21 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeBuildCommandLine>
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeReBuildCommandLine>
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeCleanCommandLine>
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <NMakeBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemDefinitionGroup>
@@ -68,4 +68,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
@@ -0,0 +1,11 @@
+option(SDL2_DISABLE_SDL2MAIN "" ON)
+option(SDL2_DISABLE_INSTALL "" ON)
+option(SDL2_DISABLE_UNINSTALL "" ON)
+option(SDL_SHARED OFF)
+set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
+option(SDL_STATIC ON)
+set(SDL_STATIC_ENABLED_BY_DEFAULT ON)
+option(SDL_TEST OFF)
+set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+set(OPT_DEF_LIBC ON)
+add_subdirectory(SDL EXCLUDE_FROM_ALL)
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="SDL\include\begin_code.h" />
+    <ClInclude Include="SDL\include\close_code.h" />
+    <ClInclude Include="SDL\include\SDL.h" />
+    <ClInclude Include="SDL\include\SDL_assert.h" />
+    <ClInclude Include="SDL\include\SDL_atomic.h" />
+    <ClInclude Include="SDL\include\SDL_audio.h" />
+    <ClInclude Include="SDL\include\SDL_bits.h" />
+    <ClInclude Include="SDL\include\SDL_blendmode.h" />
+    <ClInclude Include="SDL\include\SDL_clipboard.h" />
+    <ClInclude Include="SDL\include\SDL_config.h" />
+    <ClInclude Include="SDL\include\SDL_config_windows.h" />
+    <ClInclude Include="SDL\include\SDL_copying.h" />
+    <ClInclude Include="SDL\include\SDL_cpuinfo.h" />
+    <ClInclude Include="SDL\include\SDL_egl.h" />
+    <ClInclude Include="SDL\include\SDL_endian.h" />
+    <ClInclude Include="SDL\include\SDL_error.h" />
+    <ClInclude Include="SDL\include\SDL_events.h" />
+    <ClInclude Include="SDL\include\SDL_filesystem.h" />
+    <ClInclude Include="SDL\include\SDL_gamecontroller.h" />
+    <ClInclude Include="SDL\include\SDL_gesture.h" />
+    <ClInclude Include="SDL\include\SDL_guid.h" />
+    <ClInclude Include="SDL\include\SDL_haptic.h" />
+    <ClInclude Include="SDL\include\SDL_hints.h" />
+    <ClInclude Include="SDL\include\SDL_hidapi.h" />
+    <ClInclude Include="SDL\include\SDL_joystick.h" />
+    <ClInclude Include="SDL\include\SDL_keyboard.h" />
+    <ClInclude Include="SDL\include\SDL_keycode.h" />
+    <ClInclude Include="SDL\include\SDL_loadso.h" />
+    <ClInclude Include="SDL\include\SDL_locale.h" />
+    <ClInclude Include="SDL\include\SDL_log.h" />
+    <ClInclude Include="SDL\include\SDL_main.h" />
+    <ClInclude Include="SDL\include\SDL_messagebox.h" />
+    <ClInclude Include="SDL\include\SDL_metal.h" />
+    <ClInclude Include="SDL\include\SDL_misc.h" />
+    <ClInclude Include="SDL\include\SDL_mouse.h" />
+    <ClInclude Include="SDL\include\SDL_mutex.h" />
+    <ClInclude Include="SDL\include\SDL_name.h" />
+    <ClInclude Include="SDL\include\SDL_opengl.h" />
+    <ClInclude Include="SDL\include\SDL_opengl_glext.h" />
+    <ClInclude Include="SDL\include\SDL_opengles.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_gl2.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_gl2ext.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_gl2platform.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_khrplatform.h" />
+    <ClInclude Include="SDL\include\SDL_pixels.h" />
+    <ClInclude Include="SDL\include\SDL_platform.h" />
+    <ClInclude Include="SDL\include\SDL_power.h" />
+    <ClInclude Include="SDL\include\SDL_quit.h" />
+    <ClInclude Include="SDL\include\SDL_rect.h" />
+    <ClInclude Include="SDL\include\SDL_render.h" />
+    <ClInclude Include="SDL\include\SDL_revision.h" />
+    <ClInclude Include="SDL\include\SDL_rwops.h" />
+    <ClInclude Include="SDL\include\SDL_scancode.h" />
+    <ClInclude Include="SDL\include\SDL_sensor.h" />
+    <ClInclude Include="SDL\include\SDL_shape.h" />
+    <ClInclude Include="SDL\include\SDL_stdinc.h" />
+    <ClInclude Include="SDL\include\SDL_surface.h" />
+    <ClInclude Include="SDL\include\SDL_system.h" />
+    <ClInclude Include="SDL\include\SDL_syswm.h" />
+    <ClInclude Include="SDL\include\SDL_test.h" />
+    <ClInclude Include="SDL\include\SDL_test_assert.h" />
+    <ClInclude Include="SDL\include\SDL_test_common.h" />
+    <ClInclude Include="SDL\include\SDL_test_compare.h" />
+    <ClInclude Include="SDL\include\SDL_test_crc32.h" />
+    <ClInclude Include="SDL\include\SDL_test_font.h" />
+    <ClInclude Include="SDL\include\SDL_test_fuzzer.h" />
+    <ClInclude Include="SDL\include\SDL_test_harness.h" />
+    <ClInclude Include="SDL\include\SDL_test_images.h" />
+    <ClInclude Include="SDL\include\SDL_test_log.h" />
+    <ClInclude Include="SDL\include\SDL_test_md5.h" />
+    <ClInclude Include="SDL\include\SDL_test_memory.h" />
+    <ClInclude Include="SDL\include\SDL_test_random.h" />
+    <ClInclude Include="SDL\include\SDL_thread.h" />
+    <ClInclude Include="SDL\include\SDL_timer.h" />
+    <ClInclude Include="SDL\include\SDL_touch.h" />
+    <ClInclude Include="SDL\include\SDL_types.h" />
+    <ClInclude Include="SDL\include\SDL_version.h" />
+    <ClInclude Include="SDL\include\SDL_video.h" />
+    <ClInclude Include="SDL\include\SDL_vulkan.h" />
+    <ClInclude Include="SDL\src\audio\directsound\SDL_directsound.h" />
+    <ClInclude Include="SDL\src\audio\disk\SDL_diskaudio.h" />
+    <ClInclude Include="SDL\src\audio\dummy\SDL_dummyaudio.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audio_c.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="SDL\src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="SDL\src\audio\SDL_wave.h" />
+    <ClInclude Include="SDL\src\audio\wasapi\SDL_wasapi.h" />
+    <ClInclude Include="SDL\src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_directx.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_hid.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_immdevice.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_windows.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_xinput.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_overrides.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="SDL\src\events\blank_cursor.h" />
+    <ClInclude Include="SDL\src\events\default_cursor.h" />
+    <ClInclude Include="SDL\src\events\scancodes_windows.h" />
+    <ClInclude Include="SDL\src\events\SDL_clipboardevents_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_displayevents_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_dropevents_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_events_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_gesture_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_mouse_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_touch_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="SDL\src\haptic\SDL_haptic_c.h" />
+    <ClInclude Include="SDL\src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
+    <ClInclude Include="SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
+    <ClInclude Include="SDL\src\haptic\windows\SDL_xinputhaptic_c.h" />
+    <ClInclude Include="SDL\src\hidapi\hidapi\hidapi.h" />
+    <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
+    <ClInclude Include="SDL\src\joystick\controller_type.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_nintendo.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_gamecontrollerdb.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_sysjoystick.h" />
+    <ClInclude Include="SDL\src\joystick\usb_ids.h" />
+    <ClInclude Include="SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_rawinputjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_windowsjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_xinputjoystick_c.h" />
+    <ClInclude Include="SDL\src\libm\math_libm.h" />
+    <ClInclude Include="SDL\src\libm\math_private.h" />
+    <ClInclude Include="SDL\src\locale\SDL_syslocale.h" />
+    <ClInclude Include="SDL\src\misc\SDL_sysurl.h" />
+    <ClInclude Include="SDL\src\power\SDL_syspower.h" />
+    <ClInclude Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
+    <ClInclude Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.h" />
+    <ClInclude Include="SDL\src\render\direct3d\SDL_shaders_d3d.h" />
+    <ClInclude Include="SDL\src\render\opengles2\SDL_gles2funcs.h" />
+    <ClInclude Include="SDL\src\render\opengles2\SDL_shaders_gles2.h" />
+    <ClInclude Include="SDL\src\render\opengl\SDL_glfuncs.h" />
+    <ClInclude Include="SDL\src\render\opengl\SDL_shaders_gl.h" />
+    <ClInclude Include="SDL\src\render\SDL_d3dmath.h" />
+    <ClInclude Include="SDL\src\render\SDL_sysrender.h" />
+    <ClInclude Include="SDL\src\render\SDL_yuv_sw_c.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_blendfillrect.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_blendline.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_blendpoint.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_draw.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_drawline.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_rotate.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_triangle.h" />
+    <ClInclude Include="SDL\src\SDL_assert_c.h" />
+    <ClInclude Include="SDL\src\SDL_dataqueue.h" />
+    <ClInclude Include="SDL\src\SDL_error_c.h" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
+    <ClCompile Include="SDL\src\SDL_guid.c" />
+    <ClInclude Include="SDL\src\SDL_hints_c.h" />
+    <ClInclude Include="SDL\src\SDL_internal.h" />
+    <ClInclude Include="SDL\src\SDL_list.h" />
+    <ClInclude Include="SDL\src\SDL_log_c.h" />
+    <ClInclude Include="SDL\src\sensor\dummy\SDL_dummysensor.h" />
+    <ClInclude Include="SDL\src\sensor\SDL_sensor_c.h" />
+    <ClInclude Include="SDL\src\sensor\SDL_syssensor.h" />
+    <ClInclude Include="SDL\src\sensor\windows\SDL_windowssensor.h" />
+    <ClInclude Include="SDL\src\thread\SDL_systhread.h" />
+    <ClInclude Include="SDL\src\thread\SDL_thread_c.h" />
+    <ClInclude Include="SDL\src\thread\generic\SDL_syscond_c.h" />
+    <ClInclude Include="SDL\src\thread\windows\SDL_sysmutex_c.h" />
+    <ClInclude Include="SDL\src\thread\windows\SDL_systhread_c.h" />
+    <ClInclude Include="SDL\src\timer\SDL_timer_c.h" />
+    <ClInclude Include="SDL\src\video\dummy\SDL_nullevents_c.h" />
+    <ClInclude Include="SDL\src\video\dummy\SDL_nullframebuffer_c.h" />
+    <ClInclude Include="SDL\src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_icd.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_layer.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_platform.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_sdk_platform.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.hpp" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_android.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_beta.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_core.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_directfb.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_fuchsia.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ggp.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ios.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_macos.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_metal.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_vi.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_wayland.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_win32.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xcb.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib_xrandr.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit_auto.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit_copy.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit_slow.h" />
+    <ClInclude Include="SDL\src\video\SDL_egl_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_pixels_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_rect_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_shape_internals.h" />
+    <ClInclude Include="SDL\src\video\SDL_sysvideo.h" />
+    <ClInclude Include="SDL\src\video\SDL_vulkan_internal.h" />
+    <ClInclude Include="SDL\src\video\SDL_yuv_c.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_msctf.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsclipboard.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsevents.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsframebuffer.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsmessagebox.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsmodes.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsmouse.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengles.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsshape.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsvideo.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsvulkan.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowswindow.h" />
+    <ClInclude Include="SDL\src\video\windows\wmmsg.h" />
+    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb.h" />
+    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
+    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="SDL\src\atomic\SDL_atomic.c" />
+    <ClCompile Include="SDL\src\atomic\SDL_spinlock.c" />
+    <ClCompile Include="SDL\src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="SDL\src\audio\disk\SDL_diskaudio.c" />
+    <ClCompile Include="SDL\src\audio\dummy\SDL_dummyaudio.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audio.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audiocvt.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audiodev.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="SDL\src\audio\SDL_mixer.c" />
+    <ClCompile Include="SDL\src\audio\SDL_wave.c" />
+    <ClCompile Include="SDL\src\audio\winmm\SDL_winmm.c" />
+    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c" />
+    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi_win32.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_hid.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_immdevice.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_windows.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_xinput.c" />
+    <ClCompile Include="SDL\src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="SDL\src\events\SDL_clipboardevents.c" />
+    <ClCompile Include="SDL\src\events\SDL_displayevents.c" />
+    <ClCompile Include="SDL\src\events\SDL_dropevents.c" />
+    <ClCompile Include="SDL\src\events\SDL_events.c" />
+    <ClCompile Include="SDL\src\events\SDL_gesture.c" />
+    <ClCompile Include="SDL\src\events\SDL_keyboard.c" />
+    <ClCompile Include="SDL\src\events\SDL_mouse.c" />
+    <ClCompile Include="SDL\src\events\SDL_quit.c" />
+    <ClCompile Include="SDL\src\events\SDL_touch.c" />
+    <ClCompile Include="SDL\src\events\SDL_windowevents.c" />
+    <ClCompile Include="SDL\src\file\SDL_rwops.c" />
+    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfilesystem.c" />
+    <ClCompile Include="SDL\src\haptic\dummy\SDL_syshaptic.c" />
+    <ClCompile Include="SDL\src\haptic\SDL_haptic.c" />
+    <ClCompile Include="SDL\src\haptic\windows\SDL_dinputhaptic.c" />
+    <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c" />
+    <ClCompile Include="SDL\src\haptic\windows\SDL_xinputhaptic.c" />
+    <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c" />
+    <ClCompile Include="SDL\src\joystick\controller_type.c" />
+    <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_joystick.c" />
+    <ClCompile Include="SDL\src\joystick\virtual\SDL_virtualjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_dinputjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_rawinputjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_windowsjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_windows_gaming_input.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_xinputjoystick.c" />
+    <ClCompile Include="SDL\src\libm\e_atan2.c" />
+    <ClCompile Include="SDL\src\libm\e_exp.c" />
+    <ClCompile Include="SDL\src\libm\e_fmod.c" />
+    <ClCompile Include="SDL\src\libm\e_log.c" />
+    <ClCompile Include="SDL\src\libm\e_log10.c" />
+    <ClCompile Include="SDL\src\libm\e_pow.c" />
+    <ClCompile Include="SDL\src\libm\e_rem_pio2.c" />
+    <ClCompile Include="SDL\src\libm\e_sqrt.c" />
+    <ClCompile Include="SDL\src\libm\k_cos.c" />
+    <ClCompile Include="SDL\src\libm\k_rem_pio2.c" />
+    <ClCompile Include="SDL\src\libm\k_sin.c" />
+    <ClCompile Include="SDL\src\libm\k_tan.c" />
+    <ClCompile Include="SDL\src\libm\s_atan.c" />
+    <ClCompile Include="SDL\src\libm\s_copysign.c" />
+    <ClCompile Include="SDL\src\libm\s_cos.c" />
+    <ClCompile Include="SDL\src\libm\s_fabs.c" />
+    <ClCompile Include="SDL\src\libm\s_floor.c" />
+    <ClCompile Include="SDL\src\libm\s_scalbn.c" />
+    <ClCompile Include="SDL\src\libm\s_sin.c" />
+    <ClCompile Include="SDL\src\libm\s_tan.c" />
+    <ClCompile Include="SDL\src\loadso\windows\SDL_sysloadso.c" />
+    <ClCompile Include="SDL\src\locale\SDL_locale.c" />
+    <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c" />
+    <ClCompile Include="SDL\src\misc\SDL_url.c" />
+    <ClCompile Include="SDL\src\misc\windows\SDL_sysurl.c" />
+    <ClCompile Include="SDL\src\power\SDL_power.c" />
+    <ClCompile Include="SDL\src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.c" />
+    <ClCompile Include="SDL\src\render\direct3d12\SDL_render_d3d12.c" />
+    <ClCompile Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.c" />
+    <ClCompile Include="SDL\src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="SDL\src\render\direct3d11\SDL_render_d3d11.c" />
+    <ClCompile Include="SDL\src\render\direct3d\SDL_shaders_d3d.c" />
+    <ClCompile Include="SDL\src\render\opengl\SDL_render_gl.c" />
+    <ClCompile Include="SDL\src\render\opengl\SDL_shaders_gl.c" />
+    <ClCompile Include="SDL\src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="SDL\src\render\opengles2\SDL_shaders_gles2.c" />
+    <ClCompile Include="SDL\src\render\SDL_d3dmath.c" />
+    <ClCompile Include="SDL\src\render\SDL_render.c" />
+    <ClCompile Include="SDL\src\render\SDL_yuv_sw.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_blendfillrect.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_blendline.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_blendpoint.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_drawline.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_drawpoint.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_rotate.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_triangle.c" />
+    <ClCompile Include="SDL\src\SDL.c" />
+    <ClCompile Include="SDL\src\SDL_assert.c" />
+    <ClCompile Include="SDL\src\SDL_dataqueue.c" />
+    <ClCompile Include="SDL\src\SDL_list.c" />
+    <ClCompile Include="SDL\src\SDL_error.c" />
+    <ClCompile Include="SDL\src\SDL_hints.c" />
+    <ClCompile Include="SDL\src\SDL_log.c" />
+    <ClCompile Include="SDL\src\SDL_utils.c" />
+    <ClCompile Include="SDL\src\sensor\dummy\SDL_dummysensor.c" />
+    <ClCompile Include="SDL\src\sensor\SDL_sensor.c" />
+    <ClCompile Include="SDL\src\sensor\windows\SDL_windowssensor.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_crc16.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_crc32.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_getenv.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_iconv.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_mslibc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_stdlib.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_string.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_strtokr.c" />
+    <ClCompile Include="SDL\src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="SDL\src\thread\SDL_thread.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_syscond_cv.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_syssem.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_systhread.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_systls.c" />
+    <ClCompile Include="SDL\src\timer\SDL_timer.c" />
+    <ClCompile Include="SDL\src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="SDL\src\video\dummy\SDL_nullevents.c" />
+    <ClCompile Include="SDL\src\video\dummy\SDL_nullframebuffer.c" />
+    <ClCompile Include="SDL\src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_0.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_1.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_A.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_auto.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_copy.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_N.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_slow.c" />
+    <ClCompile Include="SDL\src\video\SDL_bmp.c" />
+    <ClCompile Include="SDL\src\video\SDL_clipboard.c" />
+    <ClCompile Include="SDL\src\video\SDL_egl.c" />
+    <ClCompile Include="SDL\src\video\SDL_fillrect.c" />
+    <ClCompile Include="SDL\src\video\SDL_pixels.c" />
+    <ClCompile Include="SDL\src\video\SDL_rect.c" />
+    <ClCompile Include="SDL\src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="SDL\src\video\SDL_shape.c" />
+    <ClCompile Include="SDL\src\video\SDL_stretch.c" />
+    <ClCompile Include="SDL\src\video\SDL_surface.c" />
+    <ClCompile Include="SDL\src\video\SDL_video.c" />
+    <ClCompile Include="SDL\src\video\SDL_vulkan_utils.c" />
+    <ClCompile Include="SDL\src\video\SDL_yuv.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsclipboard.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsevents.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsframebuffer.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsmessagebox.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsmodes.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsmouse.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsshape.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="SDL\src\SDL_guid.c" />
+    <ClCompile Include="SDL\src\atomic\SDL_atomic.c" />
+    <ClCompile Include="SDL\src\atomic\SDL_spinlock.c" />
+    <ClCompile Include="SDL\src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="SDL\src\audio\disk\SDL_diskaudio.c" />
+    <ClCompile Include="SDL\src\audio\dummy\SDL_dummyaudio.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audio.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audiocvt.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audiodev.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="SDL\src\audio\SDL_mixer.c" />
+    <ClCompile Include="SDL\src\audio\SDL_wave.c" />
+    <ClCompile Include="SDL\src\audio\winmm\SDL_winmm.c" />
+    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c" />
+    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi_win32.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_hid.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_immdevice.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_windows.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_xinput.c" />
+    <ClCompile Include="SDL\src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="SDL\src\events\SDL_clipboardevents.c" />
+    <ClCompile Include="SDL\src\events\SDL_displayevents.c" />
+    <ClCompile Include="SDL\src\events\SDL_dropevents.c" />
+    <ClCompile Include="SDL\src\events\SDL_events.c" />
+    <ClCompile Include="SDL\src\events\SDL_gesture.c" />
+    <ClCompile Include="SDL\src\events\SDL_keyboard.c" />
+    <ClCompile Include="SDL\src\events\SDL_mouse.c" />
+    <ClCompile Include="SDL\src\events\SDL_quit.c" />
+    <ClCompile Include="SDL\src\events\SDL_touch.c" />
+    <ClCompile Include="SDL\src\events\SDL_windowevents.c" />
+    <ClCompile Include="SDL\src\file\SDL_rwops.c" />
+    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfilesystem.c" />
+    <ClCompile Include="SDL\src\haptic\dummy\SDL_syshaptic.c" />
+    <ClCompile Include="SDL\src\haptic\SDL_haptic.c" />
+    <ClCompile Include="SDL\src\haptic\windows\SDL_dinputhaptic.c" />
+    <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c" />
+    <ClCompile Include="SDL\src\haptic\windows\SDL_xinputhaptic.c" />
+    <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c" />
+    <ClCompile Include="SDL\src\joystick\controller_type.c" />
+    <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_joystick.c" />
+    <ClCompile Include="SDL\src\joystick\virtual\SDL_virtualjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_dinputjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_rawinputjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_windowsjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_windows_gaming_input.c" />
+    <ClCompile Include="SDL\src\joystick\windows\SDL_xinputjoystick.c" />
+    <ClCompile Include="SDL\src\libm\e_atan2.c" />
+    <ClCompile Include="SDL\src\libm\e_exp.c" />
+    <ClCompile Include="SDL\src\libm\e_fmod.c" />
+    <ClCompile Include="SDL\src\libm\e_log.c" />
+    <ClCompile Include="SDL\src\libm\e_log10.c" />
+    <ClCompile Include="SDL\src\libm\e_pow.c" />
+    <ClCompile Include="SDL\src\libm\e_rem_pio2.c" />
+    <ClCompile Include="SDL\src\libm\e_sqrt.c" />
+    <ClCompile Include="SDL\src\libm\k_cos.c" />
+    <ClCompile Include="SDL\src\libm\k_rem_pio2.c" />
+    <ClCompile Include="SDL\src\libm\k_sin.c" />
+    <ClCompile Include="SDL\src\libm\k_tan.c" />
+    <ClCompile Include="SDL\src\libm\s_atan.c" />
+    <ClCompile Include="SDL\src\libm\s_copysign.c" />
+    <ClCompile Include="SDL\src\libm\s_cos.c" />
+    <ClCompile Include="SDL\src\libm\s_fabs.c" />
+    <ClCompile Include="SDL\src\libm\s_floor.c" />
+    <ClCompile Include="SDL\src\libm\s_scalbn.c" />
+    <ClCompile Include="SDL\src\libm\s_sin.c" />
+    <ClCompile Include="SDL\src\libm\s_tan.c" />
+    <ClCompile Include="SDL\src\loadso\windows\SDL_sysloadso.c" />
+    <ClCompile Include="SDL\src\locale\SDL_locale.c" />
+    <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c" />
+    <ClCompile Include="SDL\src\misc\SDL_url.c" />
+    <ClCompile Include="SDL\src\misc\windows\SDL_sysurl.c" />
+    <ClCompile Include="SDL\src\power\SDL_power.c" />
+    <ClCompile Include="SDL\src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.c" />
+    <ClCompile Include="SDL\src\render\direct3d12\SDL_render_d3d12.c" />
+    <ClCompile Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.c" />
+    <ClCompile Include="SDL\src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="SDL\src\render\direct3d11\SDL_render_d3d11.c" />
+    <ClCompile Include="SDL\src\render\direct3d\SDL_shaders_d3d.c" />
+    <ClCompile Include="SDL\src\render\opengl\SDL_render_gl.c" />
+    <ClCompile Include="SDL\src\render\opengl\SDL_shaders_gl.c" />
+    <ClCompile Include="SDL\src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="SDL\src\render\opengles2\SDL_shaders_gles2.c" />
+    <ClCompile Include="SDL\src\render\SDL_d3dmath.c" />
+    <ClCompile Include="SDL\src\render\SDL_render.c" />
+    <ClCompile Include="SDL\src\render\SDL_yuv_sw.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_blendfillrect.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_blendline.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_blendpoint.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_drawline.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_drawpoint.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_rotate.c" />
+    <ClCompile Include="SDL\src\render\software\SDL_triangle.c" />
+    <ClCompile Include="SDL\src\SDL.c" />
+    <ClCompile Include="SDL\src\SDL_assert.c" />
+    <ClCompile Include="SDL\src\SDL_dataqueue.c" />
+    <ClCompile Include="SDL\src\SDL_list.c" />
+    <ClCompile Include="SDL\src\SDL_error.c" />
+    <ClCompile Include="SDL\src\SDL_hints.c" />
+    <ClCompile Include="SDL\src\SDL_log.c" />
+    <ClCompile Include="SDL\src\SDL_utils.c" />
+    <ClCompile Include="SDL\src\sensor\dummy\SDL_dummysensor.c" />
+    <ClCompile Include="SDL\src\sensor\SDL_sensor.c" />
+    <ClCompile Include="SDL\src\sensor\windows\SDL_windowssensor.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_crc16.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_crc32.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_getenv.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_iconv.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_mslibc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_stdlib.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_string.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_strtokr.c" />
+    <ClCompile Include="SDL\src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="SDL\src\thread\SDL_thread.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_syscond_cv.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_syssem.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_systhread.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_systls.c" />
+    <ClCompile Include="SDL\src\timer\SDL_timer.c" />
+    <ClCompile Include="SDL\src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="SDL\src\video\dummy\SDL_nullevents.c" />
+    <ClCompile Include="SDL\src\video\dummy\SDL_nullframebuffer.c" />
+    <ClCompile Include="SDL\src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_0.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_1.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_A.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_auto.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_copy.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_N.c" />
+    <ClCompile Include="SDL\src\video\SDL_blit_slow.c" />
+    <ClCompile Include="SDL\src\video\SDL_bmp.c" />
+    <ClCompile Include="SDL\src\video\SDL_clipboard.c" />
+    <ClCompile Include="SDL\src\video\SDL_egl.c" />
+    <ClCompile Include="SDL\src\video\SDL_fillrect.c" />
+    <ClCompile Include="SDL\src\video\SDL_pixels.c" />
+    <ClCompile Include="SDL\src\video\SDL_rect.c" />
+    <ClCompile Include="SDL\src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="SDL\src\video\SDL_shape.c" />
+    <ClCompile Include="SDL\src\video\SDL_stretch.c" />
+    <ClCompile Include="SDL\src\video\SDL_surface.c" />
+    <ClCompile Include="SDL\src\video\SDL_video.c" />
+    <ClCompile Include="SDL\src\video\SDL_vulkan_utils.c" />
+    <ClCompile Include="SDL\src\video\SDL_yuv.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsclipboard.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsevents.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsframebuffer.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsmessagebox.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsmodes.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsmouse.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsshape.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="SDL\include\begin_code.h" />
+    <ClInclude Include="SDL\include\close_code.h" />
+    <ClInclude Include="SDL\include\SDL.h" />
+    <ClInclude Include="SDL\include\SDL_assert.h" />
+    <ClInclude Include="SDL\include\SDL_atomic.h" />
+    <ClInclude Include="SDL\include\SDL_audio.h" />
+    <ClInclude Include="SDL\include\SDL_bits.h" />
+    <ClInclude Include="SDL\include\SDL_blendmode.h" />
+    <ClInclude Include="SDL\include\SDL_clipboard.h" />
+    <ClInclude Include="SDL\include\SDL_config.h" />
+    <ClInclude Include="SDL\include\SDL_config_windows.h" />
+    <ClInclude Include="SDL\include\SDL_copying.h" />
+    <ClInclude Include="SDL\include\SDL_cpuinfo.h" />
+    <ClInclude Include="SDL\include\SDL_egl.h" />
+    <ClInclude Include="SDL\include\SDL_endian.h" />
+    <ClInclude Include="SDL\include\SDL_error.h" />
+    <ClInclude Include="SDL\include\SDL_events.h" />
+    <ClInclude Include="SDL\include\SDL_filesystem.h" />
+    <ClInclude Include="SDL\include\SDL_gamecontroller.h" />
+    <ClInclude Include="SDL\include\SDL_gesture.h" />
+    <ClInclude Include="SDL\include\SDL_guid.h" />
+    <ClInclude Include="SDL\include\SDL_haptic.h" />
+    <ClInclude Include="SDL\include\SDL_hints.h" />
+    <ClInclude Include="SDL\include\SDL_hidapi.h" />
+    <ClInclude Include="SDL\include\SDL_joystick.h" />
+    <ClInclude Include="SDL\include\SDL_keyboard.h" />
+    <ClInclude Include="SDL\include\SDL_keycode.h" />
+    <ClInclude Include="SDL\include\SDL_loadso.h" />
+    <ClInclude Include="SDL\include\SDL_locale.h" />
+    <ClInclude Include="SDL\include\SDL_log.h" />
+    <ClInclude Include="SDL\include\SDL_main.h" />
+    <ClInclude Include="SDL\include\SDL_messagebox.h" />
+    <ClInclude Include="SDL\include\SDL_metal.h" />
+    <ClInclude Include="SDL\include\SDL_misc.h" />
+    <ClInclude Include="SDL\include\SDL_mouse.h" />
+    <ClInclude Include="SDL\include\SDL_mutex.h" />
+    <ClInclude Include="SDL\include\SDL_name.h" />
+    <ClInclude Include="SDL\include\SDL_opengl.h" />
+    <ClInclude Include="SDL\include\SDL_opengl_glext.h" />
+    <ClInclude Include="SDL\include\SDL_opengles.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_gl2.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_gl2ext.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_gl2platform.h" />
+    <ClInclude Include="SDL\include\SDL_opengles2_khrplatform.h" />
+    <ClInclude Include="SDL\include\SDL_pixels.h" />
+    <ClInclude Include="SDL\include\SDL_platform.h" />
+    <ClInclude Include="SDL\include\SDL_power.h" />
+    <ClInclude Include="SDL\include\SDL_quit.h" />
+    <ClInclude Include="SDL\include\SDL_rect.h" />
+    <ClInclude Include="SDL\include\SDL_render.h" />
+    <ClInclude Include="SDL\include\SDL_revision.h" />
+    <ClInclude Include="SDL\include\SDL_rwops.h" />
+    <ClInclude Include="SDL\include\SDL_scancode.h" />
+    <ClInclude Include="SDL\include\SDL_sensor.h" />
+    <ClInclude Include="SDL\include\SDL_shape.h" />
+    <ClInclude Include="SDL\include\SDL_stdinc.h" />
+    <ClInclude Include="SDL\include\SDL_surface.h" />
+    <ClInclude Include="SDL\include\SDL_system.h" />
+    <ClInclude Include="SDL\include\SDL_syswm.h" />
+    <ClInclude Include="SDL\include\SDL_test.h" />
+    <ClInclude Include="SDL\include\SDL_test_assert.h" />
+    <ClInclude Include="SDL\include\SDL_test_common.h" />
+    <ClInclude Include="SDL\include\SDL_test_compare.h" />
+    <ClInclude Include="SDL\include\SDL_test_crc32.h" />
+    <ClInclude Include="SDL\include\SDL_test_font.h" />
+    <ClInclude Include="SDL\include\SDL_test_fuzzer.h" />
+    <ClInclude Include="SDL\include\SDL_test_harness.h" />
+    <ClInclude Include="SDL\include\SDL_test_images.h" />
+    <ClInclude Include="SDL\include\SDL_test_log.h" />
+    <ClInclude Include="SDL\include\SDL_test_md5.h" />
+    <ClInclude Include="SDL\include\SDL_test_memory.h" />
+    <ClInclude Include="SDL\include\SDL_test_random.h" />
+    <ClInclude Include="SDL\include\SDL_thread.h" />
+    <ClInclude Include="SDL\include\SDL_timer.h" />
+    <ClInclude Include="SDL\include\SDL_touch.h" />
+    <ClInclude Include="SDL\include\SDL_types.h" />
+    <ClInclude Include="SDL\include\SDL_version.h" />
+    <ClInclude Include="SDL\include\SDL_video.h" />
+    <ClInclude Include="SDL\include\SDL_vulkan.h" />
+    <ClInclude Include="SDL\src\audio\directsound\SDL_directsound.h" />
+    <ClInclude Include="SDL\src\audio\disk\SDL_diskaudio.h" />
+    <ClInclude Include="SDL\src\audio\dummy\SDL_dummyaudio.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audio_c.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="SDL\src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="SDL\src\audio\SDL_wave.h" />
+    <ClInclude Include="SDL\src\audio\wasapi\SDL_wasapi.h" />
+    <ClInclude Include="SDL\src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_directx.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_hid.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_immdevice.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_windows.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_xinput.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_overrides.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="SDL\src\events\blank_cursor.h" />
+    <ClInclude Include="SDL\src\events\default_cursor.h" />
+    <ClInclude Include="SDL\src\events\scancodes_windows.h" />
+    <ClInclude Include="SDL\src\events\SDL_clipboardevents_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_displayevents_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_dropevents_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_events_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_gesture_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_mouse_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_touch_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="SDL\src\haptic\SDL_haptic_c.h" />
+    <ClInclude Include="SDL\src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
+    <ClInclude Include="SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
+    <ClInclude Include="SDL\src\haptic\windows\SDL_xinputhaptic_c.h" />
+    <ClInclude Include="SDL\src\hidapi\hidapi\hidapi.h" />
+    <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
+    <ClInclude Include="SDL\src\joystick\controller_type.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_gamecontrollerdb.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_sysjoystick.h" />
+    <ClInclude Include="SDL\src\joystick\usb_ids.h" />
+    <ClInclude Include="SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_rawinputjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_windowsjoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\windows\SDL_xinputjoystick_c.h" />
+    <ClInclude Include="SDL\src\libm\math_libm.h" />
+    <ClInclude Include="SDL\src\libm\math_private.h" />
+    <ClInclude Include="SDL\src\locale\SDL_syslocale.h" />
+    <ClInclude Include="SDL\src\misc\SDL_sysurl.h" />
+    <ClInclude Include="SDL\src\power\SDL_syspower.h" />
+    <ClInclude Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
+    <ClInclude Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.h" />
+    <ClInclude Include="SDL\src\render\direct3d\SDL_shaders_d3d.h" />
+    <ClInclude Include="SDL\src\render\opengles2\SDL_gles2funcs.h" />
+    <ClInclude Include="SDL\src\render\opengles2\SDL_shaders_gles2.h" />
+    <ClInclude Include="SDL\src\render\opengl\SDL_glfuncs.h" />
+    <ClInclude Include="SDL\src\render\opengl\SDL_shaders_gl.h" />
+    <ClInclude Include="SDL\src\render\SDL_d3dmath.h" />
+    <ClInclude Include="SDL\src\render\SDL_sysrender.h" />
+    <ClInclude Include="SDL\src\render\SDL_yuv_sw_c.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_blendfillrect.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_blendline.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_blendpoint.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_draw.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_drawline.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_rotate.h" />
+    <ClInclude Include="SDL\src\render\software\SDL_triangle.h" />
+    <ClInclude Include="SDL\src\SDL_assert_c.h" />
+    <ClInclude Include="SDL\src\SDL_dataqueue.h" />
+    <ClInclude Include="SDL\src\SDL_error_c.h" />
+    <ClInclude Include="SDL\src\SDL_hints_c.h" />
+    <ClInclude Include="SDL\src\SDL_internal.h" />
+    <ClInclude Include="SDL\src\SDL_list.h" />
+    <ClInclude Include="SDL\src\SDL_log_c.h" />
+    <ClInclude Include="SDL\src\sensor\dummy\SDL_dummysensor.h" />
+    <ClInclude Include="SDL\src\sensor\SDL_sensor_c.h" />
+    <ClInclude Include="SDL\src\sensor\SDL_syssensor.h" />
+    <ClInclude Include="SDL\src\sensor\windows\SDL_windowssensor.h" />
+    <ClInclude Include="SDL\src\thread\SDL_systhread.h" />
+    <ClInclude Include="SDL\src\thread\SDL_thread_c.h" />
+    <ClInclude Include="SDL\src\thread\generic\SDL_syscond_c.h" />
+    <ClInclude Include="SDL\src\thread\windows\SDL_sysmutex_c.h" />
+    <ClInclude Include="SDL\src\thread\windows\SDL_systhread_c.h" />
+    <ClInclude Include="SDL\src\timer\SDL_timer_c.h" />
+    <ClInclude Include="SDL\src\video\dummy\SDL_nullevents_c.h" />
+    <ClInclude Include="SDL\src\video\dummy\SDL_nullframebuffer_c.h" />
+    <ClInclude Include="SDL\src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_icd.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_layer.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_platform.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_sdk_platform.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.hpp" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_android.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_beta.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_core.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_directfb.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_fuchsia.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ggp.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ios.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_macos.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_metal.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_vi.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_wayland.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_win32.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xcb.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib.h" />
+    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib_xrandr.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit_auto.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit_copy.h" />
+    <ClInclude Include="SDL\src\video\SDL_blit_slow.h" />
+    <ClInclude Include="SDL\src\video\SDL_egl_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_pixels_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_rect_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_shape_internals.h" />
+    <ClInclude Include="SDL\src\video\SDL_sysvideo.h" />
+    <ClInclude Include="SDL\src\video\SDL_vulkan_internal.h" />
+    <ClInclude Include="SDL\src\video\SDL_yuv_c.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_msctf.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsclipboard.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsevents.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsframebuffer.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsmessagebox.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsmodes.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsmouse.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengles.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsshape.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsvideo.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsvulkan.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowswindow.h" />
+    <ClInclude Include="SDL\src\video\windows\wmmsg.h" />
+    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb.h" />
+    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
+    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_nintendo.h" />
+  </ItemGroup>
+</Project>
@@ -2,10 +2,10 @@ if(WITH_LLVM)
 	CHECK_CXX_COMPILER_FLAG("-msse -msse2 -mcx16" COMPILER_X86)
 	CHECK_CXX_COMPILER_FLAG("-march=armv8-a+lse" COMPILER_ARM)

-	if(BUILD_LLVM_SUBMODULE)
+	if(BUILD_LLVM)
 		message(STATUS "LLVM will be built from the submodule.")

-		set(LLVM_TARGETS_TO_BUILD "AArch64;X86")
+		set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
 		option(LLVM_BUILD_RUNTIME OFF)
 		option(LLVM_BUILD_TOOLS OFF)
 		option(LLVM_INCLUDE_BENCHMARKS OFF)
@@ -32,54 +32,61 @@ if(WITH_LLVM)
 		endif()

 		# LLVM needs to be built out-of-tree
-		add_subdirectory(${CMAKE_SOURCE_DIR}/llvm ${CMAKE_CURRENT_BINARY_DIR}/llvm_build EXCLUDE_FROM_ALL)
-		set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/llvm_build/lib/cmake/llvm/")
+		add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/llvm/llvm/llvm ${CMAKE_BINARY_DIR}/3rdparty/llvm/llvm_build EXCLUDE_FROM_ALL)
+		set(LLVM_DIR "${CMAKE_BINARY_DIR}/3rdparty/llvm/llvm_build/lib/cmake/llvm/")

 		set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD})
+		set(STATIC_LINK_LLVM ON CACHE BOOL "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." FORCE)

 		# now tries to find LLVM again
-		find_package(LLVM 13.0 CONFIG)
+		find_package(LLVM 16.0 CONFIG)
 		if(NOT LLVM_FOUND)
 			message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
 		endif()
-
 	else()
-		message(STATUS "Using prebuilt LLVM")
+		message(STATUS "Using prebuilt or system LLVM")

 		if (LLVM_DIR AND NOT IS_ABSOLUTE "${LLVM_DIR}")
 			# change relative LLVM_DIR to be relative to the source dir
 			set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
 		endif()

-		find_package(LLVM 13.0 CONFIG)
+		find_package(LLVM 16.0 CONFIG)

 		if (NOT LLVM_FOUND)
-			if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 11)
-				message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 11.0. \
-														 Enable BUILD_LLVM_SUBMODULE option to build LLVM from included as a git submodule.")
+			if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 16)
+				message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 16. \
+														 Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
 			endif()

 			message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. \
-													 Enable BUILD_LLVM_SUBMODULE option to build LLVM from included as a git submodule.")
+													 Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
 		endif()
 	endif()

-	set(LLVM_LIBS LLVMMCJIT)
-
-	if(COMPILER_X86)
-		set(LLVM_LIBS ${LLVM_LIBS} LLVMX86CodeGen LLVMX86AsmParser)
-	endif()
-
-	if(COMPILER_ARM)
-		set(LLVM_LIBS ${LLVM_LIBS} LLVMX86CodeGen LLVMX86AsmParser LLVMAArch64CodeGen LLVMAArch64AsmParser)
-	endif()
-
-	if(WIN32 OR CMAKE_SYSTEM MATCHES "Linux")
-		set(LLVM_LIBS ${LLVM_LIBS} LLVMIntelJITEvents)
-	endif()
-
-	if(CMAKE_SYSTEM MATCHES "Linux")
-		set(LLVM_LIBS ${LLVM_LIBS} LLVMPerfJITEvents)
+	if (STATIC_LINK_LLVM)
+		if (NOT DEFINED LLVM_TARGETS_TO_BUILD)
+			if(COMPILER_ARM)
+				set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+			else()
+				set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+			endif()
+		endif()
+		if(WIN32 OR CMAKE_SYSTEM MATCHES "Linux")
+			set (LLVM_ADDITIONAL_LIBS ${LLVM_ADDITIONAL_LIBS} IntelJITEvents)
+		endif()
+		if(CMAKE_SYSTEM MATCHES "Linux")
+			set (LLVM_ADDITIONAL_LIBS ${LLVM_ADDITIONAL_LIBS} PerfJITEvents)
+		endif()
+		llvm_map_components_to_libnames(LLVM_LIBS
+			${LLVM_TARGETS_TO_BUILD}
+			${LLVM_ADDITIONAL_LIBS}
+			Core
+			ExecutionEngine
+			MCJIT
+		)
+	else()
+		set(LLVM_LIBS LLVM)
 	endif()

 	add_library(3rdparty_llvm INTERFACE)
@@ -14,9 +14,9 @@
    <ProjectGuid>{8BC303AB-25BE-4276-8E57-73F171B2D672}</ProjectGuid>
    <Keyword>MakeFileProj</Keyword>
  </PropertyGroup>
-  <Import Project="..\buildfiles\msvc\common_default.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\buildfiles\msvc\common_default_macros.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -39,9 +39,9 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm</CmakeReleaseCLI>
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm</CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm</CmakeDebugCLI>
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm</CmakeDebugCLI>
    <CmakeCleanCLI>echo Cleaning..
      for /F "delims= eol=|" %%f in ('
      dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do (
@@ -14,9 +14,9 @@
    <ProjectGuid>{A37E4273-85DB-4217-B775-CE971B87D9DF}</ProjectGuid>
    <Keyword>MakeFileProj</Keyword>
  </PropertyGroup>
-  <Import Project="..\buildfiles\msvc\common_default_clang_cl.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_clang_cl.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\buildfiles\msvc\common_default_macros.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -39,9 +39,9 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm</CmakeReleaseCLI>
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm</CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm</CmakeDebugCLI>
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm</CmakeDebugCLI>
    <CmakeCleanCLI>echo Cleaning..
      for /F "delims= eol=|" %%f in ('
      dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do (
@@ -0,0 +1,8 @@
+option (UPNPC_BUILD_STATIC "Build static library" TRUE)
+option (UPNPC_BUILD_SHARED "Build shared library" FALSE)
+option (UPNPC_BUILD_TESTS "Build test executables" FALSE)
+option (UPNPC_BUILD_SAMPLE "Build sample executables" FALSE)
+option (NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
+option (UPNPC_NO_INSTALL "Disable installation" TRUE)
+
+add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{5228f863-e0dd-4de7-aa7b-5c52b14cd4d0}</ProjectGuid>
+    <RootNamespace>miniupnpcstatic</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS;MINIUPNP_STATICLIB;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>generated;miniupnp\miniupnpc;miniupnp\miniupnpc\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <PreBuildEvent>
+      <Command>cd $(ProjectDir)miniupnp\miniupnpc\msvc
+cscript genminiupnpcstrings.vbs</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS;MINIUPNP_STATICLIB;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>generated;miniupnp\miniupnpc;miniupnp\miniupnpc\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>
+      </SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <PreBuildEvent>
+      <Command>cd $(ProjectDir)miniupnp\miniupnpc\msvc
+cscript genminiupnpcstrings.vbs</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="miniupnp\miniupnpc\src\addr_is_reserved.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\connecthostport.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\igd_desc_parse.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\minisoap.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\minissdpc.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\miniupnpc.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\miniwget.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\minixml.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\portlistingparse.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\receivedata.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\upnpcommands.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\upnpdev.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\upnperrors.c" />
+    <ClCompile Include="miniupnp\miniupnpc\src\upnpreplyparse.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="miniupnp\miniupnpc\src\addr_is_reserved.h" />
+    <ClInclude Include="miniupnp\miniupnpc\src\connecthostport.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\igd_desc_parse.h" />
+    <ClInclude Include="miniupnp\miniupnpc\src\minisoap.h" />
+    <ClInclude Include="miniupnp\miniupnpc\src\minissdpc.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\miniupnpc.h" />
+    <ClInclude Include="miniupnp\miniupnpc\miniupnpcstrings.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\miniupnpctypes.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\miniupnpc_declspec.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\miniwget.h" />
+    <ClInclude Include="miniupnp\miniupnpc\src\miniwget_private.h" />
+    <ClInclude Include="miniupnp\miniupnpc\src\minixml.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\portlistingparse.h" />
+    <ClInclude Include="miniupnp\miniupnpc\src\receivedata.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\upnpcommands.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\upnpdev.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\upnperrors.h" />
+    <ClInclude Include="miniupnp\miniupnpc\include\upnpreplyparse.h" />
+    <ClInclude Include="miniupnp\miniupnpc\src\win32_snprintf.h" />
+    <ClInclude Include="miniupnp\miniupnpc\rc_version.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -12,18 +12,21 @@
 #include <thread>
 #include <sys/types.h>
 #if _WIN32
-#define read_portable(a, b, c) (recv(a, b, c, 0))
-#define write_portable(a, b, c) (send(a, b, c, 0))
+#define read_portable(a, b, c) (recv(a, b, ::narrow<int>(c), 0))
+#define write_portable(a, b, c) (send(a, b, ::narrow<int>(c), 0))
 #define close_portable(a) (closesocket(a))
 #define bzero(b, len) (memset((b), '\0', (len)), (void)0)
 #include <WinSock2.h>
 #include <windows.h>
+#include <ws2tcpip.h>
 #else
 #define read_portable(a, b, c) (read(a, b, c))
 #define write_portable(a, b, c) (write(a, b, c))
 #define close_portable(a) (close(a))
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <arpa/inet.h>
+#include <poll.h>
 #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
 #include <unistd.h>
 #endif
@@ -79,13 +82,13 @@ namespace pine
 		 * A preallocated buffer used to store all IPC replies.
 		 * to the size of 50.000 MsgWrite64 IPC calls.
 		 */
-		char* m_ret_buffer;
+		std::vector<char> m_ret_buffer;

 		/**
 		 * IPC messages buffer.
 		 * A preallocated buffer used to store all IPC messages.
 		 */
-		char* m_ipc_buffer;
+		std::vector<char> m_ipc_buffer;

 		/**
 		 * IPC Command messages opcodes.
@@ -118,8 +121,8 @@ namespace pine
 		 */
 		struct IPCBuffer
 		{
-			int size;     /**< Size of the buffer. */
-			char* buffer; /**< Buffer. */
+			usz size{};     /**< Size of the buffer. */
+			char* buffer{}; /**< Buffer. */
 		};

 		/**
@@ -144,13 +147,30 @@ namespace pine
 		 */
 		IPCBuffer ParseCommand(char* buf, char* ret_buffer, u32 buf_size)
 		{
-			u32 ret_cnt = 5;
-			u32 buf_cnt = 0;
+			usz ret_cnt = 5;
+			usz buf_cnt = 0;
+
+			const auto error = [&]()
+			{
+				return IPCBuffer{ 5, MakeFailIPC(ret_buffer) };
+			};
+
+			const auto write_string = [&](const std::string& str)
+			{
+				if (!SafetyChecks(buf_cnt, 0, ret_cnt, str.size() + 1 + sizeof(u32), buf_size))
+					return false;
+				ToArray(ret_buffer, ::narrow<u32>(str.size() + 1), ret_cnt);
+				ret_cnt += sizeof(u32);
+				memcpy(&ret_buffer[ret_cnt], str.data(), str.size());
+				ret_cnt += str.size();
+				ret_buffer[ret_cnt++] = '\0';
+				return true;
+			};

 			while (buf_cnt < buf_size)
 			{
 				if (!SafetyChecks(buf_cnt, 1, ret_cnt, 0, buf_size))
-					return IPCBuffer{ 5, MakeFailIPC(ret_buffer) };
+					return error();
 				buf_cnt++;
 				// example IPC messages: MsgRead/Write
 				// refer to the client doc for more info on the format
@@ -169,10 +189,10 @@ namespace pine
 				case MsgRead8:
 				{
 					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 1, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr(a))
-						goto error;
+						return error();
 					const u8 res = Impl::read8(a);
 					ToArray(ret_buffer, res, ret_cnt);
 					ret_cnt += 1;
@@ -182,10 +202,10 @@ namespace pine
 				case MsgRead16:
 				{
 					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 2, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr<2>(a))
-						goto error;
+						return error();
 					const u16 res = Impl::read16(a);
 					ToArray(ret_buffer, res, ret_cnt);
 					ret_cnt += 2;
@@ -195,10 +215,10 @@ namespace pine
 				case MsgRead32:
 				{
 					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 4, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr<4>(a))
-						goto error;
+						return error();
 					const u32 res = Impl::read32(a);
 					ToArray(ret_buffer, res, ret_cnt);
 					ret_cnt += 4;
@@ -208,10 +228,10 @@ namespace pine
 				case MsgRead64:
 				{
 					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 8, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr<8>(a))
-						goto error;
+						return error();
 					u64 res = Impl::read64(a);
 					ToArray(ret_buffer, res, ret_cnt);
 					ret_cnt += 8;
@@ -221,10 +241,10 @@ namespace pine
 				case MsgWrite8:
 				{
 					if (!SafetyChecks(buf_cnt, 1 + 4, ret_cnt, 0, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr(a, vm::page_writable))
-						goto error;
+						return error();
 					Impl::write8(a, FromArray<u8>(&buf[buf_cnt], 4));
 					buf_cnt += 5;
 					break;
@@ -232,10 +252,10 @@ namespace pine
 				case MsgWrite16:
 				{
 					if (!SafetyChecks(buf_cnt, 2 + 4, ret_cnt, 0, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr<2>(a, vm::page_writable))
-						goto error;
+						return error();
 					Impl::write16(a, FromArray<u16>(&buf[buf_cnt], 4));
 					buf_cnt += 6;
 					break;
@@ -243,10 +263,10 @@ namespace pine
 				case MsgWrite32:
 				{
 					if (!SafetyChecks(buf_cnt, 4 + 4, ret_cnt, 0, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr<4>(a, vm::page_writable))
-						goto error;
+						return error();
 					Impl::write32(a, FromArray<u32>(&buf[buf_cnt], 4));
 					buf_cnt += 8;
 					break;
@@ -254,32 +274,24 @@ namespace pine
 				case MsgWrite64:
 				{
 					if (!SafetyChecks(buf_cnt, 8 + 4, ret_cnt, 0, buf_size))
-						goto error;
+						return error();
 					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
 					if (!Impl::template check_addr<8>(a, vm::page_writable))
-						goto error;
+						return error();
 					Impl::write64(a, FromArray<u64>(&buf[buf_cnt], 4));
 					buf_cnt += 12;
 					break;
 				}
 				case MsgVersion:
 				{
-					char version[256] = {};
-					sprintf(version, "RPCS3 %s", Impl::get_version_and_branch().c_str());
-					const u32 size = strlen(version) + 1;
-					version[size] = 0x00;
-					if (!SafetyChecks(buf_cnt, 0, ret_cnt, size + 4, buf_size))
-						goto error;
-					ToArray(ret_buffer, size, ret_cnt);
-					ret_cnt += 4;
-					memcpy(&ret_buffer[ret_cnt], version, size);
-					ret_cnt += size;
+					if (!write_string("RPCS3 " + Impl::get_version_and_branch()))
+						return error();
 					break;
 				}
 				case MsgStatus:
 				{
 					if (!SafetyChecks(buf_cnt, 0, ret_cnt, 4, buf_size))
-						goto error;
+						return error();
 					EmuStatus status = Impl::get_status();
 					ToArray(ret_buffer, status, ret_cnt);
 					ret_cnt += 4;
@@ -288,76 +300,35 @@ namespace pine
 				}
 				case MsgTitle:
 				{
-					const auto title_string = Impl::get_title();
-					const auto size = title_string.size() + 1;
-					char* title = new char[size];
-					sprintf(title, "%s", title_string.c_str());
-					title[size] = 0x00;
-					if (!SafetyChecks(buf_cnt, 0, ret_cnt, size + 4, buf_size))
-						goto error;
-					ToArray(ret_buffer, size, ret_cnt);
-					ret_cnt += 4;
-					memcpy(&ret_buffer[ret_cnt], title, size);
-					ret_cnt += size;
-					delete[] title;
+					if (!write_string(Impl::get_title()))
+						return error();
 					break;
 				}
 				case MsgID:
 				{
-					const auto title_id_string = Impl::get_title_ID();
-					const auto size = title_id_string.size() + 1;
-					char* title_id = new char[size];
-					sprintf(title_id, "%s", title_id_string.c_str());
-					title_id[size] = 0x00;
-					if (!SafetyChecks(buf_cnt, 0, ret_cnt, size + 4, buf_size))
-						goto error;
-					ToArray(ret_buffer, size, ret_cnt);
-					ret_cnt += 4;
-					memcpy(&ret_buffer[ret_cnt], title_id, size);
-					ret_cnt += size;
-					delete[] title_id;
+					if (!write_string(Impl::get_title_ID()))
+						return error();
 					break;
 				}
 				case MsgUUID:
 				{
-					const auto hash_string = Impl::get_executable_hash();
-					const auto size = hash_string.size() + 1;
-					char* hash = new char[size];
-					sprintf(hash, "%s", hash_string.c_str());
-					hash[size] = 0x00;
-					if (!SafetyChecks(buf_cnt, 0, ret_cnt, size + 4, buf_size))
-						goto error;
-					ToArray(ret_buffer, size, ret_cnt);
-					ret_cnt += 4;
-					memcpy(&ret_buffer[ret_cnt], hash, size);
-					ret_cnt += size;
-					delete[] hash;
+					if (!write_string(Impl::get_executable_hash()))
+						return error();
 					break;
 				}
 				case MsgGameVersion:
 				{
-					const auto game_version_string = Impl::get_app_version();
-					const auto size = game_version_string.size() + 1;
-					char* game_version = new char[size];
-					sprintf(game_version, "%s", game_version_string.c_str());
-					game_version[size] = 0x00;
-					if (!SafetyChecks(buf_cnt, 0, ret_cnt, size, buf_size))
-						goto error;
-					ToArray(ret_buffer, size, ret_cnt);
-					ret_cnt += 4;
-					memcpy(&ret_buffer[ret_cnt], game_version, size);
-					ret_cnt += size;
-					delete[] game_version;
+					if (!write_string(Impl::get_app_version()))
+						return error();
 					break;
 				}
 				default:
 				{
-				error:
-					return IPCBuffer{ 5, MakeFailIPC(ret_buffer) };
+					return error();
 				}
 				}
 			}
-			return IPCBuffer{ static_cast<int>(ret_cnt), MakeOkIPC(ret_buffer, ret_cnt) };
+			return IPCBuffer{ ret_cnt, MakeOkIPC(ret_buffer, ret_cnt) };
 		}

 		/**
@@ -366,26 +337,48 @@ namespace pine
 		 * size: size of the IPC buffer.
 		 * return value: buffer containing the status code allocated of size
 		 */
-		static inline char* MakeOkIPC(char* ret_buffer, uint32_t size = 5)
+		static inline char* MakeOkIPC(char* ret_buffer, usz size = 5)
 		{
-			ToArray<uint32_t>(ret_buffer, size, 0);
+			ToArray(ret_buffer, ::narrow<u32>(size), 0);
 			ret_buffer[4] = IPC_OK;
 			return ret_buffer;
 		}

-		static inline char* MakeFailIPC(char* ret_buffer, uint32_t size = 5)
+		static inline char* MakeFailIPC(char* ret_buffer, usz size = 5)
 		{
-			ToArray<uint32_t>(ret_buffer, size, 0);
+			ToArray(ret_buffer, ::narrow<u32>(size), 0);
 			ret_buffer[4] = IPC_FAIL;
 			return ret_buffer;
 		}

 		/**
 		 * Initializes an open socket for IPC communication.
-		 * return value: -1 if a fatal failure happened, 0 otherwise.
+		 * return value: false if a fatal failure happened, true otherwise.
 		 */
-		int StartSocket()
+		bool StartSocket()
 		{
+			::pollfd poll_fd{};
+
+			for (int pending_connection = 0; pending_connection != 1;)
+			{
+				if (thread_ctrl::state() == thread_state::aborting)
+				{
+					return false;
+				}
+
+				std::memset(&poll_fd, 0, sizeof(poll_fd));
+				poll_fd.events  = POLLIN;
+				poll_fd.revents = 0;
+				poll_fd.fd      = m_sock;
+
+#ifdef _WIN32
+				// Try to wait for an incoming connection
+				pending_connection = ::WSAPoll(&poll_fd, 1, 10);
+#else
+				pending_connection = ::poll(&poll_fd, 1, 10);
+#endif
+			}
+
 			m_msgsock = accept(m_sock, 0, 0);

 			if (m_msgsock == -1)
@@ -403,10 +396,10 @@ namespace pine
 				{
 #endif
 					Impl::error("IPC: An unrecoverable error happened! Shutting down...");
-					return -1;
+					return false;
 				}
 			}
-			return 0;
+			return true;
 		}

 		// Thread used to relay IPC commands.
@@ -414,10 +407,10 @@ namespace pine
 		{
 			// we allocate once buffers to not have to do mallocs for each IPC
 			// request, as malloc is expansive when we optimize for µs.
-			m_ret_buffer = new char[MAX_IPC_RETURN_SIZE];
-			m_ipc_buffer = new char[MAX_IPC_SIZE];
+			m_ret_buffer.resize(MAX_IPC_RETURN_SIZE);
+			m_ipc_buffer.resize(MAX_IPC_SIZE);

-			if (StartSocket() < 0)
+			if (!StartSocket())
 				return;

 			while (thread_ctrl::state() != thread_state::aborting)
@@ -437,7 +430,7 @@ namespace pine
 					if (tmp_length <= 0)
 					{
 						receive_length = 0;
-						if (StartSocket() < 0)
+						if (!StartSocket())
 							return;
 						break;
 					}
@@ -447,7 +440,7 @@ namespace pine
 					// if we got at least the final size then update
 					if (end_length == 4 && receive_length >= 4)
 					{
-						end_length = FromArray<u32>(m_ipc_buffer, 0);
+						end_length = FromArray<u32>(m_ipc_buffer.data(), 0);
 						// we'd like to avoid a client trying to do OOB
 						if (end_length > MAX_IPC_SIZE || end_length < 4)
 						{
@@ -464,12 +457,12 @@ namespace pine
 				// disconnects
 				if (receive_length != 0)
 				{
-					pine_server::IPCBuffer res = ParseCommand(&m_ipc_buffer[4], m_ret_buffer, static_cast<u32>(end_length) - 4);
+					pine_server::IPCBuffer res = ParseCommand(&m_ipc_buffer[4], m_ret_buffer.data(), static_cast<u32>(end_length) - 4);

 					// if we cannot send back our answer restart the socket
 					if (write_portable(m_msgsock, res.buffer, res.size) < 0)
 					{
-						if (StartSocket() < 0)
+						if (!StartSocket())
 							return;
 					}
 				}
@@ -485,9 +478,9 @@ namespace pine
 		 * NB: implicitely inlined
 		 */
 		template <typename T>
-		static char* ToArray(char* res_array, T res, int i)
+		static char* ToArray(char* res_array, T res, usz i)
 		{
-			memcpy((res_array + i), reinterpret_cast<char*>(&res), sizeof(T));
+			memcpy(res_array + i, reinterpret_cast<char*>(&res), sizeof(T));
 			return res_array;
 		}

@@ -508,7 +501,7 @@ namespace pine
 		 * Ensures an IPC message isn't too big.
 		 * return value: false if checks failed, true otherwise.
 		 */
-		static inline bool SafetyChecks(u32 command_len, int command_size, u32 reply_len, int reply_size = 0, u32 buf_size = MAX_IPC_SIZE - 1)
+		static inline bool SafetyChecks(usz command_len, usz command_size, usz reply_len, usz reply_size = 0, usz buf_size = MAX_IPC_SIZE - 1)
 		{
 			bool res = ((command_len + command_size) > buf_size ||
 				(reply_len + reply_size) >= MAX_IPC_RETURN_SIZE);
@@ -542,7 +535,10 @@ namespace pine
 			// yes very good windows s/sun/sin/g sure is fine
 			server.sin_family = AF_INET;
 			// localhost only
-			server.sin_addr.s_addr = inet_addr("127.0.0.1");
+			if (!inet_pton(server.sin_family, "127.0.0.1", &server.sin_addr.s_addr))
+			{
+				fmt::throw_exception("IPC: Failed to convert localhost");
+			}
 			server.sin_port = htons(Impl::get_port());

 			if (bind(m_sock, (struct sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)
@@ -614,8 +610,6 @@ namespace pine
 		~pine_server()
 		{
 			Cleanup();
-			delete[] m_ret_buffer;
-			delete[] m_ipc_buffer;
 		}

 	}; // class pine_server
@@ -0,0 +1 @@
+add_subdirectory(rtmidi EXCLUDE_FROM_ALL)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="rtmidi\RtMidi.h" />
+    <ClInclude Include="rtmidi\rtmidi_c.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="rtmidi\RtMidi.cpp" />
+    <ClCompile Include="rtmidi\rtmidi_c.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}</ProjectGuid>
+    <RootNamespace>rtmidi</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <SDLCheck>false</SDLCheck>
+      <PreprocessorDefinitions>__WINDOWS_MM__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./rtmidi/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -5,9 +5,10 @@ if(USE_SYSTEM_WOLFSSL)
 	target_link_libraries(wolfssl INTERFACE PkgConfig::WolfSSL)
 else()
 	# TODO(cjj19970505@live.cn)
-	# OPENSSL_EXTRA, WOLFSSL_DES_ECB and HAVE_SNI are unconfigurable from CMake cache.
+	# OPENSSL_EXTRA, and HAVE_SNI are unconfigurable from CMake cache.
 	# but they do have it in a TODO list (wolfssl/CMakeList, 1021)
 	add_compile_definitions(OPENSSL_EXTRA WOLFSSL_DES_ECB HAVE_SNI HAVE_WRITE_DUP)
+	add_compile_definitions(FP_MAX_BITS=8192)

 	set(WOLFSSL_TLS13 "no" CACHE INTERNAL "")
 	set(WOLFSSL_SHA224 "yes" CACHE INTERNAL "")
@@ -19,7 +20,7 @@ else()
 	set(WOLFSSL_CHACHA "yes" CACHE INTERNAL "")
 	set(WOLFSSL_FILESYSTEM "yes" CACHE INTERNAL "")
 	set(WOLFSSL_PWDBASED "yes" CACHE INTERNAL "")
-	set(WOLFSSL_FAST_MATH "no" CACHE INTERNAL "")
+	set(WOLFSSL_FAST_MATH "yes" CACHE INTERNAL "")
 	set(WOLFSSL_EXAMPLES "no" CACHE INTERNAL "")
 	set(WOLFSSL_CRYPT_TESTS "no" CACHE INTERNAL "")
 	set(WOLFSSL_ASYNC_THREADS "no" CACHE INTERNAL "")
@@ -43,6 +43,8 @@
 #define HAVE_ECC
 #define ECC_SHAMIR
 #define ECC_TIMING_RESISTANT
+#define USE_FAST_MATH
+#define FP_MAX_BITS 8192

 /* UTF-8 aware filesystem functions for Windows */
 #define WOLFSSL_USER_FILESYSTEM
@@ -11,7 +11,7 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu
 * [Python 3.6+](https://www.python.org/downloads/) (add to PATH)
 * [Qt 5.15.2](https://www.qt.io/download-qt-installer)
 * [Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community)
-* [Vulkan SDK 1.2.198+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html))
+* [Vulkan SDK 1.3.224+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html))

 **Either add the** `QTDIR` **environment variable, e.g.** `<QtInstallFolder>\5.15.2\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)**

@@ -22,8 +22,8 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst
 * Clang 12+ or GCC 11+
 * [CMake 3.16.9+](https://www.cmake.org/download/)
 * [Qt 5.15.2](https://www.qt.io/download-qt-installer)
-* [Vulkan SDK 1.2.198+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html))
-* [SDL2](https://www.libsdl.org/download-2.0.php) (for the FAudio backend)
+* [Vulkan SDK 1.3.224+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html))
+* [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)

 **If you have an NVIDIA GPU, you may need to install the libglvnd package.**

@@ -102,15 +102,16 @@ git submodule update --init

 #### Configuring the Qt plugin (if used)

-1) Go to the Qt5 menu and edit Qt5 options.
-2) Add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\5.15.2\msvc2019_64`.
-3) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added.
+1) Go to `Extensions->Qt VS Tools->Qt Versions`.
+2) Add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\5.15.2\msvc2019_64`, version will fill in automatically.
+3) Go to `Extensions->Qt VS Tools->Options->Legacy Project Format`.
+4) Set `Build: Run pre-build setup` to `true`.

 #### Building the projects

 Open `rpcs3.sln`. The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)

-You may want to download the precompiled [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z) and extract them to the root rpcs3 folder (which contains `rpcs3.sln`), as well as download and extract the [additional libs](https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z) to `lib\%CONFIGURATION%-x64\` to speed up compilation time (unoptimised/debug libs are currently not available precompiled).
+You may want to download the precompiled [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z) and extract them to `3rdparty\llvm\`, as well as download and extract the [additional libs](https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z) to `lib\%CONFIGURATION%-x64\` to speed up compilation time (unoptimised/debug libs are currently not available precompiled).

 If you're not using the precompiled libs, build the following projects in *__BUILD_BEFORE* folder by right-clicking on a project > *Build*.:
 * glslang
@@ -14,13 +14,16 @@ endif()

 option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON)
 option(WITH_LLVM "Enable usage of LLVM library" ON)
-option(BUILD_LLVM_SUBMODULE "Build LLVM from git submodule" ON)
+option(BUILD_LLVM "Build LLVM from git submodule" OFF)
+option(STATIC_LINK_LLVM "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." OFF)
 option(USE_FAUDIO "FAudio audio backend" ON)
 option(USE_LIBEVDEV "libevdev-based joystick support" ON)
 option(USE_DISCORD_RPC "Discord rich presence integration" OFF)
 option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON)
 option(USE_VULKAN "Vulkan render backend" ON)
 option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
+option(USE_SDL "Enables SDL input handler" OFF)
+option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" OFF)

 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/buildfiles/cmake")

@@ -104,9 +107,9 @@ if(WIN32)
    add_definitions(-D_WIN32_WINNT=0x0602)
 endif()

-if(APPLE)
-    include_directories(/opt/local/include)
-    link_directories(/opt/local/lib)
+if(APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+    include_directories(/opt/homebrew/include)
+    link_directories(/opt/homebrew/lib)
 endif()

 # Warnings are silenced for 3rdparty code
@@ -1,14 +1,13 @@
 RPCS3
 =====

-[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=4&branchName=master)
-[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3?label=Cirrus%20CI%20(FreeBSD)&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3)
-[![RPCS3 discord server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.me/rpcs3)
+[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3)
+[![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.me/rpcs3)

-The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows and Linux.
+The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD.

 You can find some basic information on our [**website**](https://rpcs3.net/). Game info is being populated on the [**Wiki**](https://wiki.rpcs3.net/).
-For discussion about this emulator, PS3 emulation, and game compatibility reports, please visit our [**forums**](https://forums.rpcs3.net) and our [**Discord server**](https://discord.me/RPCS3).
+For discussion about this emulator, PS3 emulation, and game compatibility reports, please visit our [**forums**](https://forums.rpcs3.net) and our [**Discord server**](https://discord.gg/RPCS3).

 [**Support Lead Developers Nekotekina and kd-11 on Patreon**](https://www.patreon.com/Nekotekina)

@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "Config.h"
 #include "util/types.hpp"
-
 #include "util/yaml.hpp"

 #include <charconv>
@@ -24,9 +23,9 @@ namespace cfg
 	{
 		for (const auto& node : owner->m_nodes)
 		{
-			if (node->get_name() == name)
+			if (node->get_name() == m_name)
 			{
-				cfg_log.fatal("Node already exists: %s", name);
+				cfg_log.fatal("Node already exists: %s", m_name);
 			}
 		}

@@ -60,9 +59,15 @@ std::vector<std::string> cfg::make_int_range(s64 min, s64 max)

 bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max)
 {
+	if (value.empty())
+	{
+		if (out) cfg_log.error("cfg::try_to_int64(): called with an empty string");
+		return false;
+	}
+
 	s64 result;
-	const char* start = &value.front();
-	const char* end = &value.back() + 1;
+	const char* start = value.data();
+	const char* end = start + value.size();
 	int base = 10;
 	int sign = +1;

@@ -72,7 +77,7 @@ bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max)
 		start += 1;
 	}

-	if (start[0] == '0' && (start[1] == 'x' || start[1] == 'X'))
+	if (start[0] == '0' && value.size() >= 2 && (start[1] == 'x' || start[1] == 'X'))
 	{
 		// Limited hex support
 		base = 16;
@@ -91,7 +96,7 @@ bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max)

 	if (result < min || result > max)
 	{
-		if (out) cfg_log.error("cfg::try_to_int64('%s'): out of bounds (%d..%d)", value, min, max);
+		if (out) cfg_log.error("cfg::try_to_int64('%s'): out of bounds (val=%d, min=%d, max=%d)", value, result, min, max);
 		return false;
 	}

@@ -106,12 +111,18 @@ std::vector<std::string> cfg::make_uint_range(u64 min, u64 max)

 bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max)
 {
+	if (value.empty())
+	{
+		if (out) cfg_log.error("cfg::try_to_uint64(): called with an empty string");
+		return false;
+	}
+
 	u64 result;
-	const char* start = &value.front();
-	const char* end = &value.back() + 1;
+	const char* start = value.data();
+	const char* end = start + value.size();
 	int base = 10;

-	if (start[0] == '0' && (start[1] == 'x' || start[1] == 'X'))
+	if (start[0] == '0' && value.size() >= 2 && (start[1] == 'x' || start[1] == 'X'))
 	{
 		// Limited hex support
 		base = 16;
@@ -128,7 +139,7 @@ bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max)

 	if (result < min || result > max)
 	{
-		if (out) cfg_log.error("cfg::try_to_uint64('%s'): out of bounds (%u..%u)", value, min, max);
+		if (out) cfg_log.error("cfg::try_to_uint64('%s'): out of bounds (val=%u, min=%u, max=%u)", value, result, min, max);
 		return false;
 	}

@@ -136,6 +147,63 @@ bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max)
 	return true;
 }

+std::vector<std::string> cfg::make_float_range(f64 min, f64 max)
+{
+	return {std::to_string(min), std::to_string(max)};
+}
+
+bool try_to_float(f64* out, std::string_view value, f64 min, f64 max)
+{
+	if (value.empty())
+	{
+		if (out) cfg_log.error("cfg::try_to_float(): called with an empty string");
+		return false;
+	}
+
+	// std::from_chars float is yet to be implemented on Xcode it seems
+	// And strtod doesn't support ranged view so we need to ensure it meets a null terminator
+	const std::string str = std::string{value};
+
+	char* end_check{};
+	const double result = std::strtod(str.data(), &end_check);
+
+	if (end_check != str.data() + str.size())
+	{
+		if (out) cfg_log.error("cfg::try_to_float('%s'): invalid float", value);
+		return false;
+	}
+
+	if (result < min || result > max)
+	{
+		if (out) cfg_log.error("cfg::try_to_float('%s'): out of bounds (val=%f, min=%f, max=%f)", value, result, min, max);
+		return false;
+	}
+
+	if (out) *out = result;
+	return true;
+}
+
+bool try_to_string(std::string* out, const f64& value)
+{
+#ifdef __APPLE__
+	if (out) *out = std::to_string(value);
+	return true;
+#else
+	std::array<char, 32> str{};
+
+	if (auto [ptr, ec] = std::to_chars(str.data(), str.data() + str.size(), value, std::chars_format::fixed); ec == std::errc())
+	{
+		if (out) *out = std::string(str.data(), ptr);
+		return true;
+	}
+	else
+	{
+		if (out) cfg_log.error("cfg::try_to_string(): could not convert value '%f' to string. error='%s'", value, std::make_error_code(ec).message());
+		return false;
+	}
+#endif
+}
+
 bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, std::string_view value)
 {
 	u64 max = umax;
@@ -162,8 +230,8 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f
 	}

 	u64 result;
-	const char* start = &value.front();
-	const char* end = &value.back() + 1;
+	const char* start = value.data();
+	const char* end = start + value.size();
 	int base = 10;

 	if (start[0] == '0' && (start[1] == 'x' || start[1] == 'X'))
@@ -183,7 +251,7 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f

 	if (result > max)
 	{
-		if (out) cfg_log.error("cfg::try_to_enum_value('%s'): out of bounds(0..%u)", value, max);
+		if (out) cfg_log.error("cfg::try_to_enum_value('%s'): out of bounds(val=%u, min=0, max=%u)", value, result, max);
 		return false;
 	}

@@ -511,6 +579,18 @@ void cfg::log_entry::from_default()
 	set_map({});
 }

+std::pair<u16, u16> cfg::device_info::get_usb_ids() const
+{
+	auto string_to_hex = [](const std::string& str) -> u16
+	{
+		u16 value = 0x0000;
+		if (!str.empty() && std::from_chars(str.data(), str.data() + str.size(), value, 16).ec != std::errc{})
+			cfg_log.error("Failed to parse hex from string \"%s\"", str);
+		return value;
+	};
+	return {string_to_hex(vid), string_to_hex(pid)};
+}
+
 void cfg::device_entry::set_map(map_of_type<device_info>&& map)
 {
 	m_map = std::move(map);
@@ -20,6 +20,9 @@ namespace cfg
 	// Format min and max unsigned values
 	std::vector<std::string> make_uint_range(u64 min, u64 max);

+	// Format min and max float values
+	std::vector<std::string> make_float_range(f64 min, f64 max);
+
 	// Internal hack
 	bool try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, std::string_view);

@@ -77,7 +80,13 @@ namespace cfg
 		// Convert to string (optional)
 		virtual std::string to_string() const
 		{
-			return{};
+			return {};
+		}
+
+		// Convert default to string (optional)
+		virtual std::string def_to_string() const
+		{
+			return {};
 		}

 		// Try to convert from string (optional)
@@ -86,7 +95,7 @@ namespace cfg
 		// Get string list (optional)
 		virtual std::vector<std::string> to_list() const
 		{
-			return{};
+			return {};
 		}

 		// Set multiple values. Implementation-specific, optional.
@@ -160,11 +169,24 @@ namespace cfg
 			return m_value ? "true" : "false";
 		}

+		std::string def_to_string() const override
+		{
+			return def ? "true" : "false";
+		}
+
 		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
 		{
-			if (value == "false")
+			if (value.size() != 4 && value.size() != 5)
+			{
+				return false;
+			}
+
+			char copy[5];
+			std::transform(value.begin(), value.end(), std::begin(copy), ::tolower);
+
+			if (value.size() == 5 && std::string_view{copy, 5} == "false")
 				m_value = false;
-			else if (value == "true")
+			else if (value.size() == 4 && std::string_view{copy, 4} == "true")
 				m_value = true;
 			else
 				return false;
@@ -204,6 +226,11 @@ namespace cfg
 			return m_value;
 		}

+		T get_default() const
+		{
+			return def;
+		}
+
 		void set(T value)
 		{
 			m_value = value;
@@ -221,6 +248,13 @@ namespace cfg
 			return result; // TODO: ???
 		}

+		std::string def_to_string() const override
+		{
+			std::string result;
+			fmt_class_string<T>::format(result, fmt_unveil<T>::get(def));
+			return result; // TODO: ???
+		}
+
 		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
 		{
 			u64 result;
@@ -256,8 +290,8 @@ namespace cfg
 		int_type def;

 		// Expose range
-		static const s64 max = Max;
-		static const s64 min = Min;
+		static constexpr s64 max = Max;
+		static constexpr s64 min = Min;

 		_int(node* owner, const std::string& name, int_type def = std::min<int_type>(Max, std::max<int_type>(Min, 0)), bool dynamic = false)
 			: _base(type::_int, owner, name, dynamic)
@@ -286,6 +320,11 @@ namespace cfg
 			return std::to_string(m_value);
 		}

+		std::string def_to_string() const override
+		{
+			return std::to_string(def);
+		}
+
 		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
 		{
 			s64 result;
@@ -300,6 +339,7 @@ namespace cfg

 		void set(const s64& value)
 		{
+			ensure(value >= Min && value <= Max);
 			m_value = static_cast<int_type>(value);
 		}

@@ -309,6 +349,90 @@ namespace cfg
 		}
 	};

+	// Float entry with custom Min/Max range.
+	template <s32 Min, s32 Max>
+	class _float final : public _base
+	{
+		static_assert(Min < Max, "Invalid cfg::_float range");
+
+		using float_type = f64;
+		atomic_t<float_type> m_value;
+
+	public:
+		float_type def;
+
+		// Expose range
+		static constexpr float_type max = Max;
+		static constexpr float_type min = Min;
+
+		_float(node* owner, const std::string& name, float_type def = std::min<float_type>(Max, std::max<float_type>(Min, 0)), bool dynamic = false)
+			: _base(type::_int, owner, name, dynamic)
+			, m_value(def)
+			, def(def)
+		{
+		}
+
+		operator float_type() const
+		{
+			return m_value;
+		}
+
+		float_type get() const
+		{
+			return m_value;
+		}
+
+		void from_default() override
+		{
+			m_value = def;
+		}
+
+		std::string to_string() const override
+		{
+			std::string result;
+			if (try_to_string(&result, m_value))
+			{
+				return result;
+			}
+
+			return "0.0";
+		}
+
+		std::string def_to_string() const override
+		{
+			std::string result;
+			if (try_to_string(&result, def))
+			{
+				return result;
+			}
+
+			return "0.0";
+		}
+
+		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
+		{
+			f64 result;
+			if (try_to_float(&result, value, Min, Max))
+			{
+				m_value = static_cast<float_type>(result);
+				return true;
+			}
+
+			return false;
+		}
+
+		void set(const f64& value)
+		{
+			ensure(value >= Min && value <= Max);
+			m_value = static_cast<float_type>(value);
+		}
+
+		std::vector<std::string> to_list() const override
+		{
+			return make_float_range(Min, Max);
+		}
+	};
+
 	// Alias for 32 bit int
 	using int32 = _int<s32{smin}, s32{smax}>;

@@ -330,8 +454,8 @@ namespace cfg
 		int_type def;

 		// Expose range
-		static const u64 max = Max;
-		static const u64 min = Min;
+		static constexpr u64 max = Max;
+		static constexpr u64 min = Min;

 		uint(node* owner, const std::string& name, int_type def = std::max<int_type>(Min, 0), bool dynamic = false)
 			: _base(type::uint, owner, name, dynamic)
@@ -360,6 +484,11 @@ namespace cfg
 			return std::to_string(m_value);
 		}

+		std::string def_to_string() const override
+		{
+			return std::to_string(def);
+		}
+
 		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
 		{
 			u64 result;
@@ -374,6 +503,7 @@ namespace cfg

 		void set(const u64& value)
 		{
+			ensure(value >= Min && value <= Max);
 			m_value = static_cast<int_type>(value);
 		}

@@ -431,6 +561,11 @@ namespace cfg
 			return *m_value.load().get();
 		}

+		std::string def_to_string() const override
+		{
+			return def;
+		}
+
 		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
 		{
 			m_value = std::string(value);
@@ -464,7 +599,7 @@ namespace cfg

 		std::vector<std::string> to_list() const override
 		{
-			return{ m_set.begin(), m_set.end() };
+			return { m_set.begin(), m_set.end() };
 		}

 		bool from_list(std::vector<std::string>&& list) override
@@ -529,6 +664,7 @@ namespace cfg
 		std::string serial;
 		std::string vid;
 		std::string pid;
+		std::pair<u16, u16> get_usb_ids() const;
 	};

 	class device_entry final : public _base
@@ -437,6 +437,9 @@ std::string fs::get_parent_dir(std::string_view path, u32 levels)

 bool fs::stat(const std::string& path, stat_t& info)
 {
+	// Ensure consistent information on failure
+	info = {};
+
 	if (auto device = get_virtual_device(path))
 	{
 		return device->stat(path, info);
@@ -1103,10 +1106,12 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 	class windows_file final : public file_base
 	{
 		const HANDLE m_handle;
+		atomic_t<u64> m_pos;

 	public:
 		windows_file(HANDLE handle)
 			: m_handle(handle)
+			, m_pos(0)
 		{
 		}

@@ -1162,7 +1167,39 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));

 				DWORD nread = 0;
-				ensure(ReadFile(m_handle, data, size, &nread, nullptr)); // "file::read"
+				OVERLAPPED ovl{};
+				const u64 pos = m_pos;
+				ovl.Offset = DWORD(pos);
+				ovl.OffsetHigh = DWORD(pos >> 32);
+				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
+				nread_sum += nread;
+				m_pos += nread;
+
+				if (nread < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+			}
+
+			return nread_sum;
+		}
+
+		u64 read_at(u64 offset, void* buffer, u64 count) override
+		{
+			u64 nread_sum = 0;
+
+			for (char* data = static_cast<char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nread = 0;
+				OVERLAPPED ovl{};
+				ovl.Offset = DWORD(offset);
+				ovl.OffsetHigh = DWORD(offset >> 32);
+				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
 				nread_sum += nread;

 				if (nread < size)
@@ -1172,6 +1209,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)

 				count -= size;
 				data += size;
+				offset += size;
 			}

 			return nread_sum;
@@ -1186,8 +1224,13 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));

 				DWORD nwritten = 0;
-				ensure(WriteFile(m_handle, data, size, &nwritten, nullptr)); // "file::write"
+				OVERLAPPED ovl{};
+				const u64 pos = m_pos;
+				ovl.Offset = DWORD(pos);
+				ovl.OffsetHigh = DWORD(pos >> 32);
+				ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write"
 				nwritten_sum += nwritten;
+				m_pos += nwritten;

 				if (nwritten < size)
 				{
@@ -1208,20 +1251,19 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 				fmt::throw_exception("Invalid whence (0x%x)", whence);
 			}

-			LARGE_INTEGER pos;
-			pos.QuadPart = offset;
+			const s64 new_pos =
+				whence == fs::seek_set ? offset :
+				whence == fs::seek_cur ? offset + m_pos :
+				whence == fs::seek_end ? offset + size() : -1;

-			const DWORD mode =
-				whence == seek_set ? FILE_BEGIN :
-				whence == seek_cur ? FILE_CURRENT : FILE_END;
-
-			if (!SetFilePointerEx(m_handle, pos, &pos, mode))
+			if (new_pos < 0)
 			{
-				g_tls_error = to_error(GetLastError());
+				fs::g_tls_error = fs::error::inval;
 				return -1;
 			}

-			return pos.QuadPart;
+			m_pos = new_pos;
+			return m_pos;
 		}

 		u64 size() override
@@ -1340,16 +1382,55 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)

 		u64 read(void* buffer, u64 count) override
 		{
-			const auto result = ::read(m_fd, buffer, count);
-			ensure(result != -1); // "file::read"
+			u64 result = 0;
+
+			// Loop because (huge?) read can be processed partially
+			while (auto r = ::read(m_fd, buffer, count))
+			{
+				ensure(r > 0); // "file::read"
+				count -= r;
+				result += r;
+				buffer = static_cast<u8*>(buffer) + r;
+				if (!count)
+					break;
+			}
+
+			return result;
+		}
+
+		u64 read_at(u64 offset, void* buffer, u64 count) override
+		{
+			u64 result = 0;
+
+			// For safety; see read()
+			while (auto r = ::pread(m_fd, buffer, count, offset))
+			{
+				ensure(r > 0); // "file::read_at"
+				count -= r;
+				offset += r;
+				result += r;
+				buffer = static_cast<u8*>(buffer) + r;
+				if (!count)
+					break;
+			}

 			return result;
 		}

 		u64 write(const void* buffer, u64 count) override
 		{
-			const auto result = ::write(m_fd, buffer, count);
-			ensure(result != -1); // "file::write"
+			u64 result = 0;
+
+			// For safety; see read()
+			while (auto r = ::write(m_fd, buffer, count))
+			{
+				ensure(r > 0); // "file::write"
+				count -= r;
+				result += r;
+				buffer = static_cast<const u8*>(buffer) + r;
+				if (!count)
+					break;
+			}

 			return result;
 		}
@@ -1463,6 +1544,21 @@ fs::file::file(const void* ptr, usz size)
 			return 0;
 		}

+		u64 read_at(u64 offset, void* buffer, u64 count) override
+		{
+			if (offset < m_size)
+			{
+				// Get readable size
+				if (const u64 result = std::min<u64>(count, m_size - offset))
+				{
+					std::memcpy(buffer, m_ptr + offset, result);
+					return result;
+				}
+			}
+
+			return 0;
+		}
+
 		u64 write(const void*, u64) override
 		{
 			return 0;
@@ -1687,7 +1783,7 @@ const std::string& fs::get_config_dir()
 		if (GetEnvironmentVariable(L"RPCS3_CONFIG_DIR", buf, size) - 1 >= size - 1 &&
 			GetModuleFileName(nullptr, buf, size) - 1 >= size - 1)
 		{
-			MessageBoxA(nullptr, fmt::format("GetModuleFileName() failed: error %u.", GetLastError()).c_str(), "fs::get_config_dir()", MB_ICONERROR);
+			MessageBoxA(nullptr, fmt::format("GetModuleFileName() failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_config_dir()", MB_ICONERROR);
 			return dir; // empty
 		}

@@ -1772,7 +1868,7 @@ const std::string& fs::get_temp_dir()
 		wchar_t buf[MAX_PATH + 2]{};
 		if (GetTempPathW(MAX_PATH + 1, buf) - 1 > MAX_PATH)
 		{
-			MessageBoxA(nullptr, fmt::format("GetTempPath() failed: error %u.", GetLastError()).c_str(), "fs::get_temp_dir()", MB_ICONERROR);
+			MessageBoxA(nullptr, fmt::format("GetTempPath() failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_temp_dir()", MB_ICONERROR);
 			return dir; // empty
 		}

@@ -1828,7 +1924,7 @@ bool fs::remove_all(const std::string& path, bool remove_root, bool is_no_dir_ok
 	return true;
 }

-u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment)
+u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment, atomic_t<bool>* cancel_flag)
 {
 	u64 result = 0;

@@ -1841,6 +1937,11 @@ u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment)

 	for (const auto& entry : root_dir)
 	{
+		if (cancel_flag && *cancel_flag)
+		{
+			return umax;
+		}
+
 		if (entry.name == "." || entry.name == "..")
 		{
 			continue;
@@ -1948,6 +2049,40 @@ fs::file fs::make_gather(std::vector<fs::file> files)
 			return 0;
 		}

+		u64 read_at(u64 start, void* buffer, u64 size) override
+		{
+			if (start < end)
+			{
+				u64 pos = start;
+
+				// Get readable size
+				if (const u64 max = std::min<u64>(size, end - pos))
+				{
+					u8* buf_out = static_cast<u8*>(buffer);
+					u64 buf_max = max;
+
+					for (auto it = ends.upper_bound(pos); it != ends.end(); ++it)
+					{
+						const u64 count = std::min<u64>(it->first - pos, buf_max);
+						const u64 read  = files[it->second].read_at(files[it->second].size() + pos - it->first, buf_out, count);
+
+						buf_out += count;
+						buf_max -= count;
+						pos     += read;
+
+						if (read < count || buf_max == 0)
+						{
+							break;
+						}
+					}
+
+					return pos - start;
+				}
+			}
+
+			return 0;
+		}
+
 		u64 write(const void*, u64) override
 		{
 			return 0;
@@ -71,6 +71,10 @@ namespace fs
 		s64 atime;
 		s64 mtime;
 		s64 ctime;
+
+		using enable_bitcopy = std::true_type;
+
+		constexpr bool operator==(const stat_t&) const = default;
 	};

 	// Helper, layout is equal to iovec struct
@@ -89,6 +93,7 @@ namespace fs
 		virtual void sync();
 		virtual bool trunc(u64 length) = 0;
 		virtual u64 read(void* buffer, u64 size) = 0;
+		virtual u64 read_at(u64 offset, void* buffer, u64 size) = 0;
 		virtual u64 write(const void* buffer, u64 size) = 0;
 		virtual u64 seek(s64 offset, seek_mode whence) = 0;
 		virtual u64 size() = 0;
@@ -105,6 +110,8 @@ namespace fs
 			: stat_t{}
 		{
 		}
+
+		using enable_bitcopy = std::false_type;
 	};

 	// Directory handle base
@@ -295,6 +302,17 @@ namespace fs
 			return m_file->read(buffer, count);
 		}

+		// Read the data from the file at specified offset in thread-safe manner
+		u64 read_at(u64 offset, void* buffer, u64 count,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
+		{
+			if (!m_file) xnull({line, col, file, func});
+			return m_file->read_at(offset, buffer, count);
+		}
+
 		// Write the data to the file and return the amount of data actually written
 		u64 write(const void* buffer, u64 count,
 			u32 line = __builtin_LINE(),
@@ -651,7 +669,7 @@ namespace fs
 	bool remove_all(const std::string& path, bool remove_root = true, bool is_no_dir_ok = false);

 	// Get size of all files recursively
-	u64 get_dir_size(const std::string& path, u64 rounding_alignment = 1);
+	u64 get_dir_size(const std::string& path, u64 rounding_alignment = 1, atomic_t<bool>* cancel_flag = nullptr);

 	enum class error : uint
 	{
@@ -681,9 +699,10 @@ namespace fs
 		T obj;
 		u64 pos;

-		container_stream(T&& obj)
+		container_stream(T&& obj, const stat_t& init_stat = {})
 			: obj(std::forward<T>(obj))
 			, pos(0)
+			, m_stat(init_stat)
 		{
 		}

@@ -694,6 +713,7 @@ namespace fs
 		bool trunc(u64 length) override
 		{
 			obj.resize(length);
+			update_time(true);
 			return true;
 		}

@@ -708,6 +728,25 @@ namespace fs
 				{
 					std::copy(obj.cbegin() + pos, obj.cbegin() + pos + max, static_cast<value_type*>(buffer));
 					pos = pos + max;
+					update_time();
+					return max;
+				}
+			}
+
+			return 0;
+		}
+
+		u64 read_at(u64 offset, void* buffer, u64 size) override
+		{
+			const u64 end = obj.size();
+
+			if (offset < end)
+			{
+				// Get readable size
+				if (const u64 max = std::min<u64>(size, end - offset))
+				{
+					std::copy(obj.cbegin() + offset, obj.cbegin() + offset + max, static_cast<value_type*>(buffer));
+					update_time();
 					return max;
 				}
 			}
@@ -743,6 +782,7 @@ namespace fs
 			obj.insert(obj.end(), src + overlap, src + size);
 			pos += size;

+			if (size) update_time(true);
 			return size;
 		}

@@ -767,13 +807,34 @@ namespace fs
 		{
 			return obj.size();
 		}
+
+		stat_t stat() override
+		{
+			return m_stat;
+		}
+
+	private:
+		stat_t m_stat{};
+
+		void update_time(bool write = false)
+		{
+			// TODO: Accurate timestamps
+			m_stat.atime++;
+
+			if (write)
+			{
+				m_stat.mtime++;
+				m_stat.mtime = std::max(m_stat.atime, m_stat.mtime);
+				m_stat.ctime = m_stat.mtime;
+			}
+		}
 	};

 	template <typename T>
-	file make_stream(T&& container = T{})
+	file make_stream(T&& container = T{}, const stat_t& stat = stat_t{})
 	{
 		file result;
-		result.reset(std::make_unique<container_stream<T>>(std::forward<T>(container)));
+		result.reset(std::make_unique<container_stream<T>>(std::forward<T>(container), stat));
 		return result;
 	}

@@ -7,6 +7,8 @@
 #include "mutex.h"
 #include "util/vm.hpp"
 #include "util/asm.hpp"
+#include "util/v128.hpp"
+#include "util/simd.hpp"
 #include <charconv>
 #include <zlib.h>

@@ -18,6 +20,34 @@ LOG_CHANNEL(jit_log, "JIT");

 void jit_announce(uptr func, usz size, std::string_view name)
 {
+#ifdef __linux__
+	static const struct tmp_perf_map
+	{
+		std::string name{fmt::format("/tmp/perf-%d.map", getpid())};
+		fs::file data{name, fs::rewrite + fs::append};
+
+		tmp_perf_map() = default;
+		tmp_perf_map(const tmp_perf_map&) = delete;
+		tmp_perf_map& operator=(const tmp_perf_map&) = delete;
+
+		~tmp_perf_map()
+		{
+			fs::remove_file(name);
+		}
+	} s_map;
+
+	if (size && name.size())
+	{
+		s_map.data.write(fmt::format("%x %x %s\n", func, size, name));
+	}
+
+	if (!func && !size && !name.size())
+	{
+		fs::remove_file(s_map.name);
+		return;
+	}
+#endif
+
 	if (!size)
 	{
 		jit_log.error("Empty function announced: %s (%p)", name, func);
@@ -81,12 +111,6 @@ void jit_announce(uptr func, usz size, std::string_view name)
 			dump.write(reinterpret_cast<uchar*>(func), size);
 		}
 	}
-
-#ifdef __linux__
-	static const fs::file s_map(fmt::format("/tmp/perf-%d.map", getpid()), fs::rewrite + fs::append);
-
-	s_map.write(fmt::format("%x %x %s\n", func, size, name));
-#endif
 }

 static u8* get_jit_memory()
@@ -174,6 +198,9 @@ static u8* add_jit_memory(usz size, uint align)
 		});
 	}

+	ensure(pointer + pos >= get_jit_memory() + Off);
+	ensure(pointer + pos < get_jit_memory() + Off + 0x40000000);
+
 	return pointer + pos;
 }

@@ -351,6 +378,473 @@ asmjit::inline_runtime::~inline_runtime()
 	utils::memory_protect(m_data, m_size, utils::protection::rx);
 }

+#if defined(ARCH_X64)
+asmjit::simd_builder::simd_builder(CodeHolder* ch) noexcept
+	: native_asm(ch)
+{
+	_init(0);
+	consts[~v128()] = this->newLabel();
+}
+
+asmjit::simd_builder::~simd_builder()
+{
+}
+
+void asmjit::simd_builder::_init(uint new_vsize)
+{
+	if ((!new_vsize && utils::has_avx512_icl()) || new_vsize == 64)
+	{
+		v0 = x86::zmm0;
+		v1 = x86::zmm1;
+		v2 = x86::zmm2;
+		v3 = x86::zmm3;
+		v4 = x86::zmm4;
+		v5 = x86::zmm5;
+		vsize = 64;
+	}
+	else if ((!new_vsize && utils::has_avx2()) || new_vsize == 32)
+	{
+		v0 = x86::ymm0;
+		v1 = x86::ymm1;
+		v2 = x86::ymm2;
+		v3 = x86::ymm3;
+		v4 = x86::ymm4;
+		v5 = x86::ymm5;
+		vsize = 32;
+	}
+	else
+	{
+		v0 = x86::xmm0;
+		v1 = x86::xmm1;
+		v2 = x86::xmm2;
+		v3 = x86::xmm3;
+		v4 = x86::xmm4;
+		v5 = x86::xmm5;
+		vsize = new_vsize ? new_vsize : 16;
+	}
+
+	if (utils::has_avx512())
+	{
+		if (!new_vsize)
+			vmask = -1;
+	}
+	else
+	{
+		vmask = 0;
+	}
+}
+
+void asmjit::simd_builder::operator()() noexcept
+{
+	for (auto&& [x, y] : consts)
+	{
+		this->align(AlignMode::kData, 16);
+		this->bind(y);
+		this->embed(&x, 16);
+	}
+}
+
+void asmjit::simd_builder::vec_cleanup_ret()
+{
+	if (utils::has_avx() && vsize > 16)
+		this->vzeroupper();
+	this->ret();
+}
+
+void asmjit::simd_builder::vec_set_all_zeros(const Operand& v)
+{
+	x86::Xmm reg(v.id());
+	if (utils::has_avx())
+		this->vpxor(reg, reg, reg);
+	else
+		this->xorps(reg, reg);
+}
+
+void asmjit::simd_builder::vec_set_all_ones(const Operand& v)
+{
+	x86::Xmm reg(v.id());
+	if (x86::Zmm zr(v.id()); zr == v)
+		this->vpternlogd(zr, zr, zr, 0xff);
+	else if (x86::Ymm yr(v.id()); yr == v)
+		this->vpcmpeqd(yr, yr, yr);
+	else if (utils::has_avx())
+		this->vpcmpeqd(reg, reg, reg);
+	else
+		this->pcmpeqd(reg, reg);
+}
+
+void asmjit::simd_builder::vec_set_const(const Operand& v, const v128& val)
+{
+	if (!val._u)
+		return vec_set_all_zeros(v);
+	if (!~val._u)
+		return vec_set_all_ones(v);
+	else
+	{
+		Label co = consts[val];
+		if (!co.isValid())
+			co = consts[val] = this->newLabel();
+		if (x86::Zmm zr(v.id()); zr == v)
+			this->vbroadcasti32x4(zr, x86::oword_ptr(co));
+		else if (x86::Ymm yr(v.id()); yr == v)
+			this->vbroadcasti128(yr, x86::oword_ptr(co));
+		else if (utils::has_avx())
+			this->vmovaps(x86::Xmm(v.id()), x86::oword_ptr(co));
+		else
+			this->movaps(x86::Xmm(v.id()), x86::oword_ptr(co));
+	}
+}
+
+void asmjit::simd_builder::vec_clobbering_test(u32 esize, const Operand& v, const Operand& rhs)
+{
+	if (esize == 64)
+	{
+		this->emit(x86::Inst::kIdVptestmd, x86::k0, v, rhs);
+		this->ktestw(x86::k0, x86::k0);
+	}
+	else if (esize == 32)
+	{
+		this->emit(x86::Inst::kIdVptest, v, rhs);
+	}
+	else if (esize == 16 && utils::has_avx())
+	{
+		this->emit(x86::Inst::kIdVptest, v, rhs);
+	}
+	else if (esize == 16 && utils::has_sse41())
+	{
+		this->emit(x86::Inst::kIdPtest, v, rhs);
+	}
+	else
+	{
+		if (v != rhs)
+			this->emit(x86::Inst::kIdPand, v, rhs);
+		if (esize == 16)
+			this->emit(x86::Inst::kIdPacksswb, v, v);
+		this->emit(x86::Inst::kIdMovq, x86::rax, v);
+		if (esize == 16 || esize == 8)
+			this->test(x86::rax, x86::rax);
+		else if (esize == 4)
+			this->test(x86::eax, x86::eax);
+		else if (esize == 2)
+			this->test(x86::ax, x86::ax);
+		else if (esize == 1)
+			this->test(x86::al, x86::al);
+		else
+			fmt::throw_exception("Unimplemented");
+	}
+}
+
+void asmjit::simd_builder::vec_broadcast_gpr(u32 esize, const Operand& v, const x86::Gp& r)
+{
+	if (esize == 2)
+	{
+		if (utils::has_avx512())
+			this->emit(x86::Inst::kIdVpbroadcastw, v, r.r32());
+		else if (utils::has_avx())
+		{
+			this->emit(x86::Inst::kIdVmovd, v, r.r32());
+			if (utils::has_avx2())
+				this->emit(x86::Inst::kIdVpbroadcastw, v, v);
+			else
+			{
+				this->emit(x86::Inst::kIdVpunpcklwd, v, v, v);
+				this->emit(x86::Inst::kIdVpshufd, v, v, Imm(0));
+			}
+		}
+		else
+		{
+			this->emit(x86::Inst::kIdMovd, v, r.r32());
+			this->emit(x86::Inst::kIdPunpcklwd, v, v);
+			this->emit(x86::Inst::kIdPshufd, v, v, Imm(0));
+		}
+	}
+	else if (esize == 4)
+	{
+		if (utils::has_avx512())
+			this->emit(x86::Inst::kIdVpbroadcastd, v, r.r32());
+		else if (utils::has_avx())
+		{
+			this->emit(x86::Inst::kIdVmovd, v, r.r32());
+			if (utils::has_avx2())
+				this->emit(x86::Inst::kIdVpbroadcastd, v, v);
+			else
+				this->emit(x86::Inst::kIdVpshufd, v, v, Imm(0));
+		}
+		else
+		{
+			this->emit(x86::Inst::kIdMovd, v, r.r32());
+			this->emit(x86::Inst::kIdPshufd, v, v, Imm(0));
+		}
+	}
+	else
+	{
+		fmt::throw_exception("Unimplemented");
+	}
+}
+
+asmjit::x86::Mem asmjit::simd_builder::ptr_scale_for_vec(u32 esize, const x86::Gp& base, const x86::Gp& index)
+{
+	switch (ensure(esize))
+	{
+	case 1: return x86::ptr(base, index, 0, 0);
+	case 2: return x86::ptr(base, index, 1, 0);
+	case 4: return x86::ptr(base, index, 2, 0);
+	case 8: return x86::ptr(base, index, 3, 0);
+	default: fmt::throw_exception("Bad esize");
+	}
+}
+
+void asmjit::simd_builder::vec_load_unaligned(u32 esize, const Operand& v, const x86::Mem& src)
+{
+	ensure(std::has_single_bit(esize));
+	ensure(std::has_single_bit(vsize));
+
+	if (esize == 2)
+	{
+		ensure(vsize >= 2);
+		if (vsize == 2)
+			vec_set_all_zeros(v);
+		if (vsize == 2 && utils::has_avx())
+			this->emit(x86::Inst::kIdVpinsrw, x86::Xmm(v.id()), x86::Xmm(v.id()), src, Imm(0));
+		else if (vsize == 2)
+			this->emit(x86::Inst::kIdPinsrw, v, src, Imm(0));
+		else if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu16, v, src);
+		else
+			return vec_load_unaligned(vsize, v, src);
+	}
+	else if (esize == 4)
+	{
+		ensure(vsize >= 4);
+		if (vsize == 4 && utils::has_avx())
+			this->emit(x86::Inst::kIdVmovd, x86::Xmm(v.id()), src);
+		else if (vsize == 4)
+			this->emit(x86::Inst::kIdMovd, v, src);
+		else if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu32, v, src);
+		else
+			return vec_load_unaligned(vsize, v, src);
+	}
+	else if (esize == 8)
+	{
+		ensure(vsize >= 8);
+		if (vsize == 8 && utils::has_avx())
+			this->emit(x86::Inst::kIdVmovq, x86::Xmm(v.id()), src);
+		else if (vsize == 8)
+			this->emit(x86::Inst::kIdMovq, v, src);
+		else if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu64, v, src);
+		else
+			return vec_load_unaligned(vsize, v, src);
+	}
+	else if (esize >= 16)
+	{
+		ensure(vsize >= 16);
+		if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu64, v, src); // Not really needed
+		else if (utils::has_avx())
+			this->emit(x86::Inst::kIdVmovdqu, v, src);
+		else
+			this->emit(x86::Inst::kIdMovups, v, src);
+	}
+	else
+	{
+		fmt::throw_exception("Unimplemented");
+	}
+}
+
+void asmjit::simd_builder::vec_store_unaligned(u32 esize, const Operand& v, const x86::Mem& dst)
+{
+	ensure(std::has_single_bit(esize));
+	ensure(std::has_single_bit(vsize));
+
+	if (esize == 2)
+	{
+		ensure(vsize >= 2);
+		if (vsize == 2 && utils::has_avx())
+			this->emit(x86::Inst::kIdVpextrw, dst, x86::Xmm(v.id()), Imm(0));
+		else if (vsize == 2 && utils::has_sse41())
+			this->emit(x86::Inst::kIdPextrw, dst, v, Imm(0));
+		else if (vsize == 2)
+			this->push(x86::rax), this->pextrw(x86::eax, x86::Xmm(v.id()), 0), this->mov(dst, x86::ax), this->pop(x86::rax);
+		else if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu16, dst, v);
+		else
+			return vec_store_unaligned(vsize, v, dst);
+	}
+	else if (esize == 4)
+	{
+		ensure(vsize >= 4);
+		if (vsize == 4 && utils::has_avx())
+			this->emit(x86::Inst::kIdVmovd, dst, x86::Xmm(v.id()));
+		else if (vsize == 4)
+			this->emit(x86::Inst::kIdMovd, dst, v);
+		else if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu32, dst, v);
+		else
+			return vec_store_unaligned(vsize, v, dst);
+	}
+	else if (esize == 8)
+	{
+		ensure(vsize >= 8);
+		if (vsize == 8 && utils::has_avx())
+			this->emit(x86::Inst::kIdVmovq, dst, x86::Xmm(v.id()));
+		else if (vsize == 8)
+			this->emit(x86::Inst::kIdMovq, dst, v);
+		else if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu64, dst, v);
+		else
+			return vec_store_unaligned(vsize, v, dst);
+	}
+	else if (esize >= 16)
+	{
+		ensure(vsize >= 16);
+		if ((vmask && vmask < 8) || vsize >= 64)
+			this->emit(x86::Inst::kIdVmovdqu64, dst, v); // Not really needed
+		else if (utils::has_avx())
+			this->emit(x86::Inst::kIdVmovdqu, dst, v);
+		else
+			this->emit(x86::Inst::kIdMovups, dst, v);
+	}
+	else
+	{
+		fmt::throw_exception("Unimplemented");
+	}
+}
+
+void asmjit::simd_builder::_vec_binary_op(x86::Inst::Id sse_op, x86::Inst::Id vex_op, x86::Inst::Id evex_op, const Operand& dst, const Operand& lhs, const Operand& rhs)
+{
+	if (utils::has_avx())
+	{
+		if (evex_op != x86::Inst::kIdNone && (vex_op == x86::Inst::kIdNone || this->_extraReg.isReg() || vsize >= 64))
+		{
+			this->evex().emit(evex_op, dst, lhs, rhs);
+		}
+		else
+		{
+			this->emit(vex_op, dst, lhs, rhs);
+		}
+	}
+	else if (dst == lhs)
+	{
+		this->emit(sse_op, dst, rhs);
+	}
+	else if (dst == rhs)
+	{
+		fmt::throw_exception("Unimplemented");
+	}
+	else
+	{
+		this->emit(x86::Inst::kIdMovaps, dst, lhs);
+		this->emit(sse_op, dst, rhs);
+	}
+}
+
+void asmjit::simd_builder::vec_umin(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs)
+{
+	using enum x86::Inst::Id;
+	if (esize == 2)
+	{
+		if (utils::has_sse41())
+			return _vec_binary_op(kIdPminuw, kIdVpminuw, kIdVpminuw, dst, lhs, rhs);
+	}
+	else if (esize == 4)
+	{
+		if (utils::has_sse41())
+			return _vec_binary_op(kIdPminud, kIdVpminud, kIdVpminud, dst, lhs, rhs);
+	}
+
+	fmt::throw_exception("Unimplemented");
+}
+
+void asmjit::simd_builder::vec_umax(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs)
+{
+	using enum x86::Inst::Id;
+	if (esize == 2)
+	{
+		if (utils::has_sse41())
+			return _vec_binary_op(kIdPmaxuw, kIdVpmaxuw, kIdVpmaxuw, dst, lhs, rhs);
+	}
+	else if (esize == 4)
+	{
+		if (utils::has_sse41())
+			return _vec_binary_op(kIdPmaxud, kIdVpmaxud, kIdVpmaxud, dst, lhs, rhs);
+	}
+
+	fmt::throw_exception("Unimplemented");
+}
+
+void asmjit::simd_builder::vec_cmp_eq(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs)
+{
+	using enum x86::Inst::Id;
+	if (esize == 2)
+	{
+		if (vsize == 64)
+		{
+			this->evex().emit(kIdVpcmpeqw, x86::k0, lhs, rhs);
+			this->evex().emit(kIdVpmovm2w, dst, x86::k0);
+		}
+		else
+		{
+			_vec_binary_op(kIdPcmpeqw, kIdVpcmpeqw, kIdNone, dst, lhs, rhs);
+		}
+	}
+	else if (esize == 4)
+	{
+		if (vsize == 64)
+		{
+			this->evex().emit(kIdVpcmpeqd, x86::k0, lhs, rhs);
+			this->evex().emit(kIdVpmovm2d, dst, x86::k0);
+		}
+		else
+		{
+			_vec_binary_op(kIdPcmpeqd, kIdVpcmpeqd, kIdNone, dst, lhs, rhs);
+		}
+	}
+	else
+	{
+		fmt::throw_exception("Unimplemented");
+	}
+}
+
+void asmjit::simd_builder::vec_extract_high(u32, const Operand& dst, const Operand& src)
+{
+	if (vsize == 32)
+		this->vextracti32x8(x86::Ymm(dst.id()), x86::Zmm(src.id()), 1);
+	else if (vsize == 16)
+		this->vextracti128(x86::Xmm(dst.id()), x86::Ymm(src.id()), 1);
+	else
+	{
+		if (utils::has_avx())
+			this->vpsrldq(x86::Xmm(dst.id()), x86::Xmm(src.id()), vsize);
+		else
+		{
+			this->movdqa(x86::Xmm(dst.id()), x86::Xmm(src.id()));
+			this->psrldq(x86::Xmm(dst.id()), vsize);
+		}
+	}
+}
+
+void asmjit::simd_builder::vec_extract_gpr(u32 esize, const x86::Gp& dst, const Operand& src)
+{
+	if (esize == 8 && utils::has_avx())
+		this->vmovq(dst.r64(), x86::Xmm(src.id()));
+	else if (esize == 8)
+		this->movq(dst.r64(), x86::Xmm(src.id()));
+	else if (esize == 4 && utils::has_avx())
+		this->vmovd(dst.r32(), x86::Xmm(src.id()));
+	else if (esize == 4)
+		this->movd(dst.r32(), x86::Xmm(src.id()));
+	else if (esize == 2 && utils::has_avx())
+		this->vpextrw(dst.r32(), x86::Xmm(src.id()), 0);
+	else if (esize == 2)
+		this->pextrw(dst.r32(), x86::Xmm(src.id()), 0);
+	else
+		fmt::throw_exception("Unimplemented");
+}
+
+#endif /* X86 */
+
 #ifdef LLVM_AVAILABLE

 #include <unordered_map>
@@ -813,7 +1307,7 @@ std::string jit_compiler::cpu(const std::string& _cpu)

 	if (m_cpu.empty())
 	{
-		m_cpu = llvm::sys::getHostCPUName().operator std::string();
+		m_cpu = llvm::sys::getHostCPUName().str();

 		if (m_cpu == "sandybridge" ||
 			m_cpu == "ivybridge" ||
@@ -828,7 +1322,10 @@ std::string jit_compiler::cpu(const std::string& _cpu)
 			m_cpu == "icelake-client" ||
 			m_cpu == "icelake-server" ||
 			m_cpu == "tigerlake" ||
-			m_cpu == "rocketlake")
+			m_cpu == "rocketlake" ||
+			m_cpu == "alderlake" ||
+			m_cpu == "raptorlake" ||
+			m_cpu == "meteorlake")
 		{
 			// Downgrade if AVX is not supported by some chips
 			if (!utils::has_avx())
@@ -859,11 +1356,51 @@ std::string jit_compiler::cpu(const std::string& _cpu)
 			// Upgrade
 			m_cpu = "znver2";
 		}
+
+		if ((m_cpu == "znver3" || m_cpu == "goldmont" || m_cpu == "alderlake" || m_cpu == "raptorlake" || m_cpu == "meteorlake") && utils::has_avx512_icl())
+		{
+			// Upgrade
+			m_cpu = "icelake-client";
+		}
+
+		if (m_cpu == "goldmont" && utils::has_avx2())
+		{
+			// Upgrade
+			m_cpu = "alderlake";
+		}
 	}

 	return m_cpu;
 }

+std::string jit_compiler::triple1()
+{
+#if defined(_WIN32)
+	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
+#elif defined(__APPLE__) && defined(ARCH_X64)
+	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
+#elif defined(__APPLE__) && defined(ARCH_ARM64)
+	return llvm::Triple::normalize("aarch64-unknown-linux-gnu");
+#else
+	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
+#endif
+}
+
+std::string jit_compiler::triple2()
+{
+#if defined(_WIN32) && defined(ARCH_X64)
+	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
+#elif defined(_WIN32) && defined(ARCH_ARM64)
+	return llvm::Triple::normalize("aarch64-unknown-linux-gnu");
+#elif defined(__APPLE__) && defined(ARCH_X64)
+	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
+#elif defined(__APPLE__) && defined(ARCH_ARM64)
+	return llvm::Triple::normalize("aarch64-unknown-linux-gnu");
+#else
+	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
+#endif
+}
+
 jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags)
 	: m_context(new llvm::LLVMContext)
 	, m_cpu(cpu(_cpu))
@@ -871,15 +1408,13 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 	std::string result;

 	auto null_mod = std::make_unique<llvm::Module> ("null_", *m_context);
-#if defined(__APPLE__) && defined(ARCH_ARM64)
-	// Force override triple on Apple arm64 or we'll get linking errors.
-	null_mod->setTargetTriple(llvm::Triple::normalize(utils::c_llvm_default_triple));
-#endif
+	null_mod->setTargetTriple(jit_compiler::triple1());
+
+	std::unique_ptr<llvm::RTDyldMemoryManager> mem;

 	if (_link.empty())
 	{
-		std::unique_ptr<llvm::RTDyldMemoryManager> mem;
-
+		// Auxiliary JIT (does not use custom memory manager, only writes the objects)
 		if (flags & 0x1)
 		{
 			mem = std::make_unique<MemoryManager1>();
@@ -887,31 +1422,31 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 		else
 		{
 			mem = std::make_unique<MemoryManager2>();
-			null_mod->setTargetTriple(llvm::Triple::normalize(utils::c_llvm_default_triple));
+			null_mod->setTargetTriple(jit_compiler::triple2());
 		}
+	}
+	else
+	{
+		mem = std::make_unique<MemoryManager1>();
+	}

-		// Auxiliary JIT (does not use custom memory manager, only writes the objects)
+	{
 		m_engine.reset(llvm::EngineBuilder(std::move(null_mod))
 			.setErrorStr(&result)
 			.setEngineKind(llvm::EngineKind::JIT)
 			.setMCJITMemoryManager(std::move(mem))
 			.setOptLevel(llvm::CodeGenOpt::Aggressive)
 			.setCodeModel(flags & 0x2 ? llvm::CodeModel::Large : llvm::CodeModel::Small)
+#ifdef __APPLE__
+			//.setCodeModel(llvm::CodeModel::Large)
+#endif
+			.setRelocationModel(llvm::Reloc::Model::PIC_)
 			.setMCPU(m_cpu)
 			.create());
 	}
-	else
-	{
-		// Primary JIT
-		m_engine.reset(llvm::EngineBuilder(std::move(null_mod))
-			.setErrorStr(&result)
-			.setEngineKind(llvm::EngineKind::JIT)
-			.setMCJITMemoryManager(std::make_unique<MemoryManager1>())
-			.setOptLevel(llvm::CodeGenOpt::Aggressive)
-			.setCodeModel(flags & 0x2 ? llvm::CodeModel::Large : llvm::CodeModel::Small)
-			.setMCPU(m_cpu)
-			.create());

+	if (!_link.empty())
+	{
 		for (auto&& [name, addr] : _link)
 		{
 			m_engine->updateGlobalMapping(name, addr);
@@ -996,6 +1531,11 @@ bool jit_compiler::check(const std::string& path)
 	return false;
 }

+void jit_compiler::update_global_mapping(const std::string& name, u64 addr)
+{
+	m_engine->updateGlobalMapping(name, addr);
+}
+
 void jit_compiler::fin()
 {
 	m_engine->finalizeObject();
@@ -42,6 +42,7 @@
 #include <string>
 #include <string_view>
 #include <unordered_map>
+#include <util/v128.hpp>

 #if defined(ARCH_X64)
 using native_asm = asmjit::x86::Assembler;
@@ -211,40 +212,182 @@ namespace asmjit
 	}

 #if defined(ARCH_X64)
-	template <uint Size>
-	struct native_vec;
-
-	template <>
-	struct native_vec<16> { using type = x86::Xmm; };
-
-	template <>
-	struct native_vec<32> { using type = x86::Ymm; };
-
-	template <>
-	struct native_vec<64> { using type = x86::Zmm; };
-
-	template <uint Size>
-	using native_vec_t = typename native_vec<Size>::type;
-
-	// if (count > step) { for (; ctr < (count - step); ctr += step) {...} count -= ctr; }
-	inline void build_incomplete_loop(native_asm& c, auto ctr, auto count, u32 step, auto&& build)
+	struct simd_builder : native_asm
 	{
-		asmjit::Label body = c.newLabel();
-		asmjit::Label exit = c.newLabel();
+		std::unordered_map<v128, Label> consts;

-		ensure((step & (step - 1)) == 0);
-		c.cmp(count, step);
-		c.jbe(exit);
-		c.sub(count, step);
-		c.align(asmjit::AlignMode::kCode, 16);
-		c.bind(body);
-		build();
-		c.add(ctr, step);
-		c.sub(count, step);
-		c.ja(body);
-		c.add(count, step);
-		c.bind(exit);
-	}
+		Operand v0, v1, v2, v3, v4, v5;
+
+		uint vsize = 16;
+		uint vmask = 0;
+
+		simd_builder(CodeHolder* ch) noexcept;
+		~simd_builder();
+
+		void operator()() noexcept;
+
+		void _init(uint new_vsize = 0);
+		void vec_cleanup_ret();
+		void vec_set_all_zeros(const Operand& v);
+		void vec_set_all_ones(const Operand& v);
+		void vec_set_const(const Operand& v, const v128& value);
+		void vec_clobbering_test(u32 esize, const Operand& v, const Operand& rhs);
+		void vec_broadcast_gpr(u32 esize, const Operand& v, const x86::Gp& r);
+
+		// return x86::ptr(base, ctr, X, 0) where X is set for esize accordingly
+		x86::Mem ptr_scale_for_vec(u32 esize, const x86::Gp& base, const x86::Gp& index);
+
+		void vec_load_unaligned(u32 esize, const Operand& v, const x86::Mem& src);
+		void vec_store_unaligned(u32 esize, const Operand& v, const x86::Mem& dst);
+		void vec_partial_move(u32 esize, const Operand& dst, const Operand& src);
+
+		void _vec_binary_op(x86::Inst::Id sse_op, x86::Inst::Id vex_op, x86::Inst::Id evex_op, const Operand& dst, const Operand& lhs, const Operand& rhs);
+
+		void vec_shuffle_xi8(const Operand& dst, const Operand& lhs, const Operand& rhs)
+		{
+			using enum x86::Inst::Id;
+			_vec_binary_op(kIdPshufb, kIdVpshufb, kIdVpshufb, dst, lhs, rhs);
+		}
+
+		void vec_xor(u32, const Operand& dst, const Operand& lhs, const Operand& rhs)
+		{
+			using enum x86::Inst::Id;
+			_vec_binary_op(kIdPxor, kIdVpxor, kIdVpxord, dst, lhs, rhs);
+		}
+
+		void vec_or(u32, const Operand& dst, const Operand& lhs, const Operand& rhs)
+		{
+			using enum x86::Inst::Id;
+			_vec_binary_op(kIdPor, kIdVpor, kIdVpord, dst, lhs, rhs);
+		}
+
+		void vec_andn(u32, const Operand& dst, const Operand& lhs, const Operand& rhs)
+		{
+			using enum x86::Inst::Id;
+			_vec_binary_op(kIdPandn, kIdVpandn, kIdVpandnd, dst, lhs, rhs);
+		}
+
+		void vec_umin(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs);
+		void vec_umax(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs);
+		void vec_cmp_eq(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs);
+
+		void vec_extract_high(u32 esize, const Operand& dst, const Operand& src);
+		void vec_extract_gpr(u32 esize, const x86::Gp& dst, const Operand& src);
+
+		simd_builder& keep_if_not_masked()
+		{
+			if (vmask && vmask < 8)
+			{
+				this->k(x86::KReg(vmask));
+			}
+
+			return *this;
+		}
+
+		simd_builder& zero_if_not_masked()
+		{
+			if (vmask && vmask < 8)
+			{
+				this->k(x86::KReg(vmask));
+				this->z();
+			}
+
+			return *this;
+		}
+
+		void build_loop(u32 esize, const x86::Gp& reg_ctr, const x86::Gp& reg_cnt, auto&& build, auto&& reduce)
+		{
+			ensure((esize & (esize - 1)) == 0);
+			ensure(esize <= vsize);
+
+			Label body = this->newLabel();
+			Label next = this->newLabel();
+			Label exit = this->newLabel();
+
+			const u32 step = vsize / esize;
+
+			this->xor_(reg_ctr.r32(), reg_ctr.r32()); // Reset counter reg
+			this->cmp(reg_cnt, step);
+			this->jb(next); // If count < step, skip main loop body
+			this->align(AlignMode::kCode, 16);
+			this->bind(body);
+			this->sub(reg_cnt, step);
+			build();
+			this->add(reg_ctr, step);
+			this->cmp(reg_cnt, step);
+			this->jae(body);
+			this->bind(next);
+
+			if (vmask)
+			{
+				// Build single last iteration (masked)
+				this->test(reg_cnt, reg_cnt);
+				this->jz(exit);
+
+				if (esize == 1 && vsize == 64)
+				{
+					this->bzhi(reg_cnt.r64(), x86::Mem(consts[~u128()], 0), reg_cnt.r64());
+					this->kmovq(x86::k7, reg_cnt.r64());
+				}
+				else
+				{
+					this->bzhi(reg_cnt.r32(), x86::Mem(consts[~u128()], 0), reg_cnt.r32());
+					this->kmovd(x86::k7, reg_cnt.r32());
+				}
+
+				vmask = 7;
+				build();
+
+				// Rollout reduction step
+				this->bind(exit);
+				while (true)
+				{
+					vsize /= 2;
+					if (vsize < esize)
+						break;
+					this->_init(vsize);
+					reduce();
+				}
+			}
+			else
+			{
+				// Build unrolled loop tail (reduced vector width)
+				while (true)
+				{
+					vsize /= 2;
+					if (vsize < esize)
+						break;
+
+					// Shall not clobber flags
+					this->_init(vsize);
+					reduce();
+
+					if (vsize == esize)
+					{
+						// Last "iteration"
+						this->test(reg_cnt, reg_cnt);
+						this->jz(exit);
+						build();
+					}
+					else
+					{
+						const u32 step = vsize / esize;
+						Label next = this->newLabel();
+						this->cmp(reg_cnt, step);
+						this->jb(next);
+						build();
+						this->add(reg_ctr, step);
+						this->sub(reg_cnt, step);
+						this->bind(next);
+					}
+				}
+
+				this->bind(exit);
+			}
+
+			this->_init(0);
+		}
+	};

 	// for (; count > 0; ctr++, count--)
 	inline void build_loop(native_asm& c, auto ctr, auto count, auto&& build)
@@ -262,19 +405,40 @@ namespace asmjit
 		c.ja(body);
 		c.bind(exit);
 	}
+
+	inline void maybe_flush_lbr(native_asm& c, uint count = 2)
+	{
+		// Workaround for bad LBR callstacks which happen in some situations (mainly TSX) - execute additional RETs
+		Label next = c.newLabel();
+		c.lea(x86::rcx, x86::qword_ptr(next));
+
+		for (u32 i = 0; i < count; i++)
+		{
+			c.push(x86::rcx);
+			c.sub(x86::rcx, 16);
+		}
+
+		for (u32 i = 0; i < count; i++)
+		{
+			c.ret();
+			c.align(asmjit::AlignMode::kCode, 16);
+		}
+
+		c.bind(next);
+	}
 #endif
 }

 // Build runtime function with asmjit::X86Assembler
 template <typename FT, typename Asm = native_asm, typename F>
-inline FT build_function_asm(std::string_view name, F&& builder)
+inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime* custom_runtime = nullptr)
 {
 #ifdef __APPLE__
 	pthread_jit_write_protect_np(false);
 #endif
 	using namespace asmjit;

-	auto& rt = get_global_runtime();
+	auto& rt = custom_runtime ? *custom_runtime : get_global_runtime();

 	CodeHolder code;
 	code.init(rt.environment());
@@ -312,6 +476,12 @@ inline FT build_function_asm(std::string_view name, F&& builder)
 		builder(compiler, args);
 	}

+	if constexpr (std::is_invocable_r_v<void, Asm>)
+	{
+		// Finalization
+		compiler();
+	}
+
 	const auto result = rt._add(&code);
 	jit_announce(result, code.codeSize(), name);
 	return reinterpret_cast<FT>(uptr(result));
@@ -362,6 +532,9 @@ public:
 	// Add object (path to obj file)
 	void add(const std::string& path);

+	// Update global mapping for a single value
+	void update_global_mapping(const std::string& name, u64 addr);
+
 	// Check object file
 	static bool check(const std::string& path);

@@ -373,6 +546,12 @@ public:

 	// Get CPU info
 	static std::string cpu(const std::string& _cpu);
+
+	// Get system triple (PPU)
+	static std::string triple1();
+
+	// Get system triple (SPU)
+	static std::string triple2();
 };

 #endif
@@ -5,6 +5,8 @@
 #include "util/logs.hpp"
 #include "util/v128.hpp"

+#include <locale>
+#include <codecvt>
 #include <algorithm>
 #include <string_view>
 #include "Thread.h"
@@ -13,8 +15,6 @@
 #include <Windows.h>
 #else
 #include <errno.h>
-#include <locale>
-#include <codecvt>
 #endif

 std::string wchar_to_utf8(std::wstring_view src)
@@ -26,11 +26,23 @@ std::string wchar_to_utf8(std::wstring_view src)
 	WideCharToMultiByte(CP_UTF8, 0, src.data(), src.size(), utf8_string.data(), tmp_size, nullptr, nullptr);
 	return utf8_string;
 #else
-	std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter{};
+	std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter{};
 	return converter.to_bytes(src.data());
 #endif
 }

+std::string utf16_to_utf8(std::u16string_view src)
+{
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{};
+	return converter.to_bytes(src.data());
+}
+
+std::u16string utf8_to_utf16(std::string_view src)
+{
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{};
+	return converter.from_bytes(src.data());
+}
+
 std::wstring utf8_to_wchar(std::string_view src)
 {
 #ifdef _WIN32
@@ -67,6 +79,17 @@ std::string fmt::win_error_to_string(unsigned long error, void* module_handle)

 	return message;
 }
+
+std::string fmt::win_error_to_string(const fmt::win_error& error)
+{
+	return fmt::win_error_to_string(error.error, error.module_handle);
+}
+
+template <>
+void fmt_class_string<fmt::win_error>::format(std::string& out, u64 arg)
+{
+	fmt::append(out, "%s", fmt::win_error_to_string(get_object(arg)));
+}
 #endif

 template <>
@@ -191,6 +214,26 @@ void fmt_class_string<std::vector<char8_t>>::format(std::string& out, u64 arg)
 	out.append(obj.cbegin(), obj.cend());
 }

+template <>
+void fmt_class_string<fmt::buf_to_hexstring>::format(std::string& out, u64 arg)
+{
+	const auto& _arg = get_object(arg);
+	const std::vector<u8> buf(_arg.buf, _arg.buf + _arg.len);
+	out.reserve(out.size() + (buf.size() * 3));
+	static constexpr char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+	for (usz index = 0; index < buf.size(); index++)
+	{
+		out += hex[buf[index] >> 4];
+		out += hex[buf[index] & 15];
+
+		if (((index + 1) % 16) == 0)
+			out += '\n';
+		else
+			out += ' ';
+	}
+}
+
 void format_byte_array(std::string& out, const uchar* data, usz size)
 {
 	if (!size)
@@ -443,7 +486,7 @@ struct fmt::cfmt_src
 	{
 // Hack: use known function pointers to determine type
 #define TYPE(type) \
-	if (sup[extra].fmt_string == &fmt_class_string<type>::format) return sizeof(type);
+		if (sup[extra].fmt_string == &fmt_class_string<type>::format) return sizeof(type);

 		TYPE(int);
 		TYPE(llong);
@@ -451,10 +494,11 @@ struct fmt::cfmt_src
 		TYPE(short);
 		if (std::is_signed<char>::value) TYPE(char);
 		TYPE(long);
-		TYPE(u128);
 		TYPE(s128);

 #undef TYPE
+		if (sup[extra].fmt_string == &fmt_class_string<u128>::format)
+			return -1;

 		return 0;
 	}
@@ -555,7 +599,7 @@ std::string fmt::trim(const std::string& source, const std::string& values)
 	return source.substr(begin, source.find_last_not_of(values) + 1);
 }

-std::string fmt::to_upper(const std::string& string)
+std::string fmt::to_upper(std::string_view string)
 {
 	std::string result;
 	result.resize(string.size());
@@ -563,7 +607,7 @@ std::string fmt::to_upper(const std::string& string)
 	return result;
 }

-std::string fmt::to_lower(const std::string& string)
+std::string fmt::to_lower(std::string_view string)
 {
 	std::string result;
 	result.resize(string.size());
@@ -609,3 +653,13 @@ bool fmt::match(const std::string& source, const std::string& mask)

 	return true;
 }
+
+std::string get_file_extension(const std::string& file_path)
+{
+	if (usz dotpos = file_path.find_last_of('.'); dotpos != std::string::npos && dotpos + 1 < file_path.size())
+	{
+		return file_path.substr(dotpos + 1);
+	}
+
+	return {};
+}
@@ -10,8 +10,15 @@ namespace fmt
 	static std::string format(const CharT(&)[N], const Args&...);

 #ifdef _WIN32
+	struct win_error
+	{
+		unsigned long error{};
+		void* module_handle{};
+	};
+
 	// Get a string for a windows error (DWORD). Optionally a module HANDLE can be passed.
 	std::string win_error_to_string(unsigned long error, void* module_handle = nullptr);
+	std::string win_error_to_string(const win_error& error);
 #endif
 }

@@ -237,6 +244,29 @@ struct fmt_class_string<wchar_t*, void> : fmt_class_string<const wchar_t*>
 {
 };

+namespace fmt
+{
+	template <typename T>
+	concept StringConvertible = requires (T & t)
+	{
+		{ t.to_string() } -> std::convertible_to<std::string>;
+	};
+}
+
+template <fmt::StringConvertible T>
+struct fmt_class_string<T, void>
+{
+	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
+	{
+		return *reinterpret_cast<const T*>(static_cast<uptr>(arg));
+	}
+
+	static void format(std::string& out, u64 arg)
+	{
+		out += get_object(arg).to_string();
+	}
+};
+
 namespace fmt
 {
 	// Both uchar and std::byte are allowed
@@ -10,12 +10,14 @@

 std::wstring utf8_to_wchar(std::string_view src);
 std::string wchar_to_utf8(std::wstring_view src);
+std::string utf16_to_utf8(std::u16string_view src);
+std::u16string utf8_to_utf16(std::string_view src);

 // Copy null-terminated string from a std::string or a char array to a char array with truncation
 template <typename D, typename T>
-inline void strcpy_trunc(D& dst, const T& src)
+inline void strcpy_trunc(D&& dst, const T& src)
 {
-	const usz count = std::size(src) >= std::size(dst) ? std::size(dst) - 1 : std::size(src);
+	const usz count = std::size(src) >= std::size(dst) ? std::max<usz>(std::size(dst), 1) - 1 : std::size(src);
 	std::memcpy(std::data(dst), std::data(src), count);
 	std::memset(std::data(dst) + count, 0, std::size(dst) - count);
 }
@@ -26,6 +28,15 @@ bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max);
 // Convert string to unsigned integer
 bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max);

+// Convert string to float
+bool try_to_float(f64* out, std::string_view value, f64 min, f64 max);
+
+// Convert float to string locale independent
+bool try_to_string(std::string* out, const f64& value);
+
+// Get the file extension of a file path ("png", "jpg", etc.)
+std::string get_file_extension(const std::string& file_path);
+
 namespace fmt
 {
 	std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = -1);
@@ -162,8 +173,17 @@ namespace fmt
 		return result;
 	}

-	std::string to_upper(const std::string& string);
-	std::string to_lower(const std::string& string);
+	std::string to_upper(std::string_view string);
+	std::string to_lower(std::string_view string);

 	bool match(const std::string& source, const std::string& mask);
+
+	struct buf_to_hexstring
+	{
+		buf_to_hexstring(const u8* buf, usz len)
+			: buf(buf), len(len) {}
+
+		const u8* buf;
+		usz len;
+	};
 }
@@ -4,11 +4,11 @@
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/lv2/sys_mmapper.h"
 #include "Emu/Cell/lv2/sys_event.h"
+#include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Thread.h"
 #include "Utilities/JIT.h"
 #include <thread>
-#include <sstream>
 #include <cfenv>

 #ifdef _WIN32
@@ -16,7 +16,15 @@
 #include <Psapi.h>
 #include <process.h>
 #include <sysinfoapi.h>
+
+#include "util/dyn_lib.hpp"
+
+DYNAMIC_IMPORT_RENAME("Kernel32.dll", SetThreadDescriptionImport, "SetThreadDescription", HRESULT(HANDLE hThread, PCWSTR lpThreadDescription));
+
 #else
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #ifdef __APPLE__
 #define _XOPEN_SOURCE
 #define __USE_GNU
@@ -94,35 +102,21 @@ thread_local bool g_tls_access_violation_recovered = false;
 extern thread_local std::string(*g_tls_log_prefix)();

 // Report error and call std::abort(), defined in main.cpp
-[[noreturn]] void report_fatal_error(std::string_view);
-
-template <>
-void fmt_class_string<std::thread::id>::format(std::string& out, u64 arg)
-{
-	std::ostringstream ss;
-	ss << get_object(arg);
-	out += ss.str();
-}
+[[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true);

 std::string dump_useful_thread_info()
 {
-	thread_local volatile bool guard = false;
-
 	std::string result;

-	// In case the dumping function was the cause for the exception/access violation
-	// Avoid recursion
-	if (std::exchange(guard, true))
-	{
-		return result;
-	}
-
 	if (auto cpu = get_current_cpu_thread())
 	{
-		cpu->dump_all(result);
+		// Wrap it to disable some internal exceptions when printing (not thrown on main thread)
+		Emu.BlockingCallFromMainThread([&]()
+		{
+			cpu->dump_all(result);
+		});
 	}

-	guard = false;
 	return result;
 }

@@ -289,8 +283,11 @@ enum x64_op_t : u32
 	X64OP_ADC, // lock adc [mem], ...
 	X64OP_SUB, // lock sub [mem], ...
 	X64OP_SBB, // lock sbb [mem], ...
+	X64OP_BEXTR,
 };

+static thread_local x64_reg_t s_tls_reg3{};
+
 void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, usz& out_size, usz& out_length)
 {
 	// simple analysis of x64 code allows to reinterpret MOV or other instructions in any desired way
@@ -751,10 +748,12 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, usz
 		const u8 vopm = op1 == 0xc5 ? 1 : op2 & 0x1f;
 		const u8 vop1 = op1 == 0xc5 ? op3 : code[2];
 		const u8 vlen = (opx & 0x4) ? 32 : 16;
-		//const u8 vreg = (~opx >> 3) & 0xf;
+		const u8 vreg = (~opx >> 3) & 0xf;
 		out_length += op1 == 0xc5 ? 2 : 3;
 		code += op1 == 0xc5 ? 2 : 3;

+		s_tls_reg3 = x64_reg_t{vreg};
+
 		if (vopm == 0x1) switch (vop1) // Implied leading byte 0x0F
 		{
 		case 0x11:
@@ -784,6 +783,22 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, usz
 		}
 		}

+		if (vopm == 0x2) switch (vop1) // Implied leading bytes 0x0F 0x38
+		{
+		case 0xf7:
+		{
+			if (!repe && !repne && vlen == 16) // BEXTR r32,mem,r32
+			{
+				out_op = X64OP_BEXTR;
+				out_reg = get_modRM_reg_xmm(code, rex);
+				out_size = opx & 0x80 ? 8 : 4;
+				out_length += get_modRM_size(code);
+				return;
+			}
+			break;
+		}
+		}
+
 		break;
 	}
 	case 0xc6:
@@ -1248,16 +1263,18 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe

 	const auto cpu = get_current_cpu_thread();

-	if (rsx::g_access_violation_handler)
+	if (addr < RAW_SPU_BASE_ADDR && vm::check_addr(addr) && rsx::g_access_violation_handler)
 	{
+		bool state_changed = false;
+
 		if (cpu)
 		{
-			vm::temporary_unlock(*cpu);
+			state_changed = vm::temporary_unlock(*cpu);
 		}

 		bool handled = rsx::g_access_violation_handler(addr, is_writing);

-		if (cpu && (cpu->state += cpu_flag::temp, cpu->test_stopped()))
+		if (state_changed && (cpu->state += cpu_flag::temp, cpu->test_stopped()))
 		{
 			//
 		}
@@ -1377,6 +1394,37 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe

 			break;
 		}
+		case X64OP_BEXTR:
+		{
+			u32 value;
+			if (is_writing || !thread->read_reg(addr, value))
+			{
+				return false;
+			}
+
+			value = stx::se_storage<u32>::swap(value);
+
+			u64 ctrl;
+			if (!get_x64_reg_value(context, s_tls_reg3, d_size, i_size, ctrl))
+			{
+				return false;
+			}
+
+			u8 start = ctrl & 0xff;
+			u8 _len = (ctrl & 0xff00) >> 8;
+			if (_len > 32)
+				_len = 32;
+			if (start > 32)
+				start = 32;
+			value = (u64{value} >> start) & ~(u64{umax} << _len);
+
+			if (!put_x64_reg_value(context, reg, d_size, value) || !set_x64_cmp_flags(context, d_size, value, 0))
+			{
+				return false;
+			}
+
+			break;
+		}
 		case X64OP_STORE:
 		case X64OP_STORE_BE:
 		{
@@ -1467,7 +1515,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 			}
 		}

-		if (pf_port_id)
+		if (auto pf_port = idm::get<lv2_obj, lv2_event_port>(pf_port_id); pf_port && pf_port->queue)
 		{
 			// We notify the game that a page fault occurred so it can rectify it.
 			// Note, for data3, were the memory readable AND we got a page fault, it must be due to a write violation since reads are allowed.
@@ -1505,21 +1553,34 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 				}
 			}

-			// Deschedule
-			if (cpu->id_type() == 1)
-			{
-				lv2_obj::sleep(*cpu);
-			}

 			// Now, place the page fault event onto table so that other functions [sys_mmapper_free_address and pagefault recovery funcs etc]
 			// know that this thread is page faulted and where.

 			auto& pf_events = g_fxo->get<page_fault_event_entries>();
+
+			// De-schedule
+			if (cpu->id_type() == 1)
 			{
-				std::lock_guard pf_lock(pf_events.pf_mutex);
-				pf_events.events.emplace(cpu, addr);
+				cpu->state -= cpu_flag::signal; // Cannot use check_state here and signal must be removed if exists
+				lv2_obj::sleep(*cpu);
 			}

+			auto send_event = [&]() -> error_code
+			{
+				lv2_obj::notify_all_t notify_later{};
+
+				std::lock_guard pf_lock(pf_events.pf_mutex);
+
+				if (auto error = pf_port->queue->send(pf_port->name ? pf_port->name : ((u64{process_getpid() + 0u} << 32) | u64{pf_port_id}), data1, data2, data3))
+				{
+					return error;
+				}
+
+				pf_events.events.emplace(cpu, addr);
+				return {};
+			};
+
 			sig_log.warning("Page_fault %s location 0x%x because of %s memory", is_writing ? "writing" : "reading",
 				addr, data3 == SYS_MEMORY_PAGE_FAULT_CAUSE_READ_ONLY ? "writing read-only" : "using unmapped");

@@ -1531,19 +1592,18 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 				}
 			}

-			error_code sending_error = sys_event_port_send(pf_port_id, data1, data2, data3);
+			error_code sending_error = not_an_error(CELL_EBUSY);

 			// If we fail due to being busy, wait a bit and try again.
-			while (static_cast<u32>(sending_error) == CELL_EBUSY)
+			for (; static_cast<u32>(sending_error) == CELL_EBUSY; thread_ctrl::wait_for(1000))
 			{
+				sending_error = send_event();
+
 				if (cpu->is_stopped())
 				{
 					sending_error = {};
 					break;
 				}
-
-				thread_ctrl::wait_for(1000);
-				sending_error = sys_event_port_send(pf_port_id, data1, data2, data3);
 			}

 			if (sending_error)
@@ -1644,7 +1704,7 @@ static void append_thread_name(std::string& msg)
 	}
 	else
 	{
-		fmt::append(msg, "Thread id = %s.\n", std::this_thread::get_id());
+		fmt::append(msg, "Thread id = %u.\n", thread_ctrl::get_tid());
 	}
 }

@@ -1771,7 +1831,11 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept

 const bool s_exception_handler_set = []() -> bool
 {
+#ifdef USE_ASAN
+	if (!AddVectoredExceptionHandler(FALSE, (PVECTORED_EXCEPTION_HANDLER)exception_handler))
+#else
 	if (!AddVectoredExceptionHandler(1, (PVECTORED_EXCEPTION_HANDLER)exception_handler))
+#endif
 	{
 		report_fatal_error("AddVectoredExceptionHandler() failed.");
 	}
@@ -1806,7 +1870,7 @@ static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept
 	const bool is_executing = err & 0x10;
 	const bool is_writing = err & 0x2;
 #elif defined(ARCH_ARM64)
-	const bool is_executing = uptr(info->si_addr) == RIP(context);
+	const bool is_executing = uptr(info->si_addr) == uptr(RIP(context));
 	const u32 insn = is_executing ? 0 : *reinterpret_cast<u32*>(RIP(context));
 	const bool is_writing = (insn & 0xbfff0000) == 0x0c000000
 		|| (insn & 0xbfe00000) == 0x0c800000
@@ -1931,7 +1995,10 @@ const bool s_terminate_handler_set = []() -> bool
 	std::set_terminate([]()
 	{
 		if (IsDebuggerPresent())
+		{
+			logs::listener::sync_all();
 			utils::trap();
+		}

 		report_fatal_error("RPCS3 has abnormally terminated.");
 	});
@@ -2025,6 +2092,13 @@ void thread_base::initialize(void (*error_cb)())

 void thread_base::set_name(std::string name)
 {
+#ifdef _WIN32
+	if (SetThreadDescriptionImport)
+	{
+		SetThreadDescriptionImport(GetCurrentThread(), utf8_to_wchar(name).c_str());
+	}
+#endif
+
 #ifdef _MSC_VER
 	struct THREADNAME_INFO
 	{
@@ -2069,7 +2143,7 @@ void thread_base::set_name(std::string name)
 u64 thread_base::finalize(thread_state result_state) noexcept
 {
 	// Report pending errors
-	error_code::error_report(0, 0, 0, 0);
+	error_code::error_report(0, nullptr, nullptr, nullptr, nullptr);

 #ifdef _WIN32
 	static thread_local ULONG64 tls_cycles{};
@@ -2358,10 +2432,9 @@ void thread_ctrl::wait_for(u64 usec, [[maybe_unused]] bool alert /* true */)
 	{
 		struct itimerspec timeout;
 		u64 missed;
-		u64 nsec = usec * 1000ull;

-		timeout.it_value.tv_nsec = (nsec % 1000000000ull);
-		timeout.it_value.tv_sec = nsec / 1000000000ull;
+		timeout.it_value.tv_nsec = usec * 1'000ull;
+		timeout.it_value.tv_sec = 0;
 		timeout.it_interval.tv_sec = 0;
 		timeout.it_interval.tv_nsec = 0;
 		timerfd_settime(fd_timer, 0, &timeout, NULL);
@@ -2587,26 +2660,24 @@ void thread_base::exec()
 	while (shared_ptr<thread_future> head = m_taskq.exchange(null_ptr))
 	{
 		// TODO: check if adapting reverse algorithm is feasible here
-		shared_ptr<thread_future>* prev{};
+		thread_future* prev_head{head.get()};

-		for (auto ptr = head.get(); ptr; ptr = ptr->next.get())
+		for (thread_future* prev{};;)
 		{
-			utils::prefetch_exec(ptr->exec.load());
+			utils::prefetch_exec(prev_head->exec.load());

-			ptr->prev = prev;
-
-			if (ptr->next)
+			if (auto next = prev_head->next.get())
 			{
-				prev = &ptr->next;
+				prev = std::exchange(prev_head, next);
+				prev_head->prev = prev;
+			}
+			else
+			{
+				break;
 			}
 		}

-		if (!prev)
-		{
-			prev = &head;
-		}
-
-		for (auto ptr = prev->get(); ptr; ptr = ptr->prev->get())
+		for (auto ptr = prev_head; ptr; ptr = ptr->prev)
 		{
 			if (auto task = ptr->exec.load()) [[likely]]
 			{
@@ -2630,11 +2701,6 @@ void thread_base::exec()
 				// Partial cleanup
 				ptr->next.reset();
 			}
-
-			if (!ptr->prev)
-			{
-				break;
-			}
 		}

 		if (!m_taskq) [[likely]]
@@ -2654,7 +2720,10 @@ void thread_base::exec()
 	sig_log.fatal("Thread terminated due to fatal error: %s", reason);

 	if (IsDebuggerPresent())
+	{
+		logs::listener::sync_all();
 		utils::trap();
+	}

 	if (const auto _this = g_tls_this_thread)
 	{
@@ -2714,7 +2783,7 @@ void thread_ctrl::detect_cpu_layout()
 		if (!GetLogicalProcessorInformationEx(relationship,
 			reinterpret_cast<SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *>(buffer.data()), &buffer_size))
 		{
-			sig_log.error("GetLogicalProcessorInformationEx failed (size=%u, error=%u)", buffer_size, GetLastError());
+			sig_log.error("GetLogicalProcessorInformationEx failed (size=%u, error=%s)", buffer_size, fmt::win_error{GetLastError(), nullptr});
 		}
 		else
 		{
@@ -2961,7 +3030,7 @@ void thread_ctrl::set_native_priority(int priority)

 	if (!SetThreadPriority(_this_thread, native_priority))
 	{
-		sig_log.error("SetThreadPriority() failed: 0x%x", GetLastError());
+		sig_log.error("SetThreadPriority() failed: %s", fmt::win_error{GetLastError(), nullptr});
 	}
 #else
 	int policy;
@@ -3013,7 +3082,7 @@ void thread_ctrl::set_thread_affinity_mask(u64 mask)
 	HANDLE _this_thread = GetCurrentThread();
 	if (!SetThreadAffinityMask(_this_thread, !mask ? process_affinity_mask : mask))
 	{
-		sig_log.error("Failed to set thread affinity 0x%x: error 0x%x.", mask, GetLastError());
+		sig_log.error("Failed to set thread affinity 0x%x: error: %s", mask, fmt::win_error{GetLastError(), nullptr});
 	}
 #elif __APPLE__
 	// Supports only one core
@@ -3139,6 +3208,8 @@ u64 thread_ctrl::get_tid()
 {
 #ifdef _WIN32
 	return GetCurrentThreadId();
+#elif defined(__linux__)
+	return syscall(SYS_gettid);
 #else
 	return reinterpret_cast<u64>(pthread_self());
 #endif
@@ -95,7 +95,7 @@ class thread_future

 	shared_ptr<thread_future> next{};

-	shared_ptr<thread_future>* prev{};
+	thread_future* prev{};

 protected:
 	atomic_t<void(*)(thread_base*, thread_future*)> exec{};
@@ -635,13 +635,21 @@ public:
 	// Join thread by thread_state::finished
 	named_thread& operator=(thread_state s)
 	{
+		bool notify_sync = false;
+
+		if (s >= thread_state::aborting && thread::m_sync.fetch_op([](u64& v){ return !(v & 3) && (v |= 1); }).second)
+		{
+			notify_sync = true;
+		}
+
 		if constexpr (std::is_assignable_v<Context&, thread_state>)
 		{
 			static_cast<Context&>(*this) = s;
 		}

-		if (s >= thread_state::aborting && thread::m_sync.fetch_op([](u64& v){ return !(v & 3) && (v |= 1); }).second)
+		if (notify_sync)
 		{
+			// Notify after context abortion has been made so all conditions for wake-up be satisfied by the time of notification
 			thread::m_sync.notify_one(1);
 		}

@@ -1,37 +1,36 @@
 #pragma once

 #include "util/types.hpp"
+#include "util/vm.hpp"
 #include "StrFmt.h"
 #include <vector>
 #include <algorithm>

-
 namespace utils
 {
 	class address_range_vector;

-
 	/**
-	 * Constexprs
+	 * Helpers
 	 */
-	constexpr inline u32 page_start(u32 addr)
+	static inline u32 page_start(u32 addr)
 	{
-		return addr & ~4095u;
+		return addr & ~(c_page_size - 1);
 	}

-	constexpr inline u32 next_page(u32 addr)
+	static inline u32 next_page(u32 addr)
 	{
-		return page_start(addr + 4096u);
+		return page_start(addr) + c_page_size;
 	}

-	constexpr inline u32 page_end(u32 addr)
+	static inline u32 page_end(u32 addr)
 	{
 		return next_page(addr) - 1;
 	}

-	constexpr inline u32 is_page_aligned(u32 addr)
+	static inline u32 is_page_aligned(u32 val)
 	{
-		return page_start(addr) == addr;
+		return (val & (c_page_size - 1)) == 0;
 	}


@@ -186,7 +185,7 @@ namespace utils

 		bool is_page_range() const
 		{
-			return (valid() && start % 4096u == 0 && length() % 4096u == 0);
+			return (valid() && is_page_aligned(start) && is_page_aligned(length()));
 		}

 		address_range to_page_range() const
@@ -18,6 +18,13 @@ namespace patch_key
 	static const std::string patch = "Patch";
 	static const std::string patch_version = "Patch Version";
 	static const std::string version = "Version";
+	static const std::string enabled = "Enabled";
+	static const std::string config_values = "Configurable Values";
+	static const std::string value = "Value";
+	static const std::string type = "Type";
+	static const std::string min = "Min";
+	static const std::string max = "Max";
+	static const std::string allowed_values = "Allowed Values";
 }

 inline static const std::string patch_engine_version = "1.2";
@@ -45,6 +52,21 @@ enum class patch_type
 	bef32,
 	bef64,
 	utf8, // Text of string (not null-terminated automatically)
+	move_file, // Move file
+	hide_file, // Hide file
+};
+
+static constexpr bool patch_type_uses_hex_offset(patch_type type)
+{
+	return type >= patch_type::alloc && type <= patch_type::utf8;
+}
+
+enum class patch_configurable_type
+{
+	double_range,
+	double_enum,
+	long_range,
+	long_enum
 };

 class patch_engine
@@ -54,6 +76,7 @@ public:
 	{
 		patch_type type = patch_type::load;
 		u32 offset = 0;
+		std::string original_offset{}; // Used for specifying paths
 		std::string original_value{}; // Used for import consistency (avoid rounding etc.)
 		union
 		{
@@ -63,7 +86,40 @@ public:
 		mutable u32 alloc_addr = 0; // Used to save optional allocation address (if occured)
 	};

-	using patch_app_versions = std::unordered_map<std::string /*app_version*/, bool /*enabled*/>;
+	struct patch_allowed_value
+	{
+		std::string label;
+		f64 value{};
+
+		bool operator==(const patch_allowed_value& other) const
+		{
+			return value == other.value && label == other.label;
+		}
+	};
+
+	struct patch_config_value
+	{
+		f64 value{};
+		f64 min{};
+		f64 max{};
+		patch_configurable_type type{};
+		std::vector<patch_allowed_value> allowed_values;
+
+		bool operator==(const patch_config_value& other) const
+		{
+			return value == other.value && min == other.min && max == other.max && type == other.type && allowed_values == other.allowed_values;
+		}
+
+		void set_and_check_value(f64 new_value, const std::string& name);
+	};
+
+	struct patch_config_values
+	{
+		bool enabled{};
+		std::map<std::string, patch_config_value> config_values;
+	};
+
+	using patch_app_versions = std::unordered_map<std::string /*app_version*/, patch_config_values>;
 	using patch_serials = std::unordered_map<std::string /*serial*/, patch_app_versions>;
 	using patch_titles = std::unordered_map<std::string /*serial*/, patch_serials>;

@@ -78,10 +134,12 @@ public:
 		std::string author{};
 		std::string notes{};
 		std::string source_path{};
+		std::map<std::string, patch_config_value> default_config_values;

 		// Redundant information for accessibility (see patch_container)
 		std::string hash{};
 		std::string version{};
+		std::map<std::string, patch_config_value> actual_config_values;
 	};

 	struct patch_container
@@ -42,6 +42,8 @@ public:
 	// Underlying type
 	using under = std::underlying_type_t<T>;

+	ENABLE_BITWISE_SERIALIZATION;
+
 private:
 	// Underlying value
 	under m_data;
@@ -49,7 +51,7 @@ private:
 	friend class atomic_bs_t<T>;

 	// Value constructor
-	constexpr explicit bs_t(int, under data)
+	constexpr explicit bs_t(int, under data) noexcept
 		: m_data(data)
 	{
 	}
@@ -71,19 +73,19 @@ public:
 	bs_t() = default;

 	// Construct from a single bit
-	constexpr bs_t(T bit)
+	constexpr bs_t(T bit) noexcept
 		: m_data(shift(bit))
 	{
 	}

 	// Test for empty bitset
-	constexpr explicit operator bool() const
+	constexpr explicit operator bool() const noexcept
 	{
 		return m_data != 0;
 	}

 	// Extract underlying data
-	constexpr explicit operator under() const
+	constexpr explicit operator under() const noexcept
 	{
 		return m_data;
 	}
@@ -138,7 +140,7 @@ public:
 		return bs_t(0, lhs.m_data ^ rhs.m_data);
 	}

-	constexpr bool operator ==(bs_t rhs) const
+	constexpr bool operator ==(bs_t rhs) const noexcept
 	{
 		return m_data == rhs.m_data;
 	}
@@ -371,12 +373,12 @@ public:
 	bool bit_test_reset(uint bit) = delete;
 	bool bit_test_invert(uint bit) = delete;

-	bool all_of(bs_t arg)
+	bool all_of(bs_t arg) const
 	{
 		return base::load().all_of(arg);
 	}

-	bool none_of(bs_t arg)
+	bool none_of(bs_t arg) const
 	{
 		return base::load().none_of(arg);
 	}
@@ -367,9 +367,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}

-		if (!ctx.type)
+		const usz src_type = src.type(ctx.args);
+
+		if (!ctx.type || src_type > 8)
 		{
-			ctx.type = static_cast<u8>(src.type(ctx.args));
+			ctx.type = static_cast<u8>(src_type);

 			if (!ctx.type)
 			{
@@ -379,7 +381,13 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)

 		// Sign-extended argument expected
 		const u64 val = src.template get<u64>(ctx.args);
-		const bool negative = ctx.type && static_cast<s64>(val) < 0;
+		bool negative = ctx.type && ctx.type <= 8 && static_cast<s64>(val) < 0;
+
+		if (ctx.type == 16)
+		{
+			u128 val2 = *reinterpret_cast<const u128*>(val);
+			negative = !!(val2 & (u128{1} << 127));
+		}

 		const usz start = out.size();

@@ -398,15 +406,14 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 				out.push_back(' ');
 			}

-			if (ctx.type == 16)
+			if (ctx.type >= 16)
 			{
-				// TODO: support negative values (s128)
-				u128 val2 = *reinterpret_cast<u128*>(val);
-				write_decimal(val2, ctx.prec);
+				u128 val2 = *reinterpret_cast<const u128*>(val);
+				write_decimal(negative ? u128{} - val2 : val2, ctx.prec);
 			}
 			else
 			{
-				write_decimal(negative ? 0 - val : val, ctx.prec);
+				write_decimal(negative ? u64{} - val : val, ctx.prec);
 			}
 		}

@@ -438,9 +445,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}

-		if (!ctx.type)
+		const usz src_type = src.type(ctx.args);
+
+		if (!ctx.type || src_type > 8)
 		{
-			ctx.type = static_cast<u8>(src.type(ctx.args));
+			ctx.type = static_cast<u8>(src_type);

 			if (!ctx.type)
 			{
@@ -471,9 +480,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)

 		if ((ctx.alter && val) || !ctx.dot || ctx.prec)
 		{
-			if (ctx.type == 16)
+			if (ctx.type >= 16)
 			{
-				u128 val2 = *reinterpret_cast<u128*>(val);
+				u128 val2 = *reinterpret_cast<const u128*>(val);
 				write_octal(val2, ctx.prec);
 			}
 			else
@@ -504,9 +513,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}

-		if (!ctx.type)
+		const usz src_type = src.type(ctx.args);
+
+		if (!ctx.type || src_type > 8)
 		{
-			ctx.type = static_cast<u8>(src.type(ctx.args));
+			ctx.type = static_cast<u8>(src_type);

 			if (!ctx.type)
 			{
@@ -537,9 +548,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)

 		if ((ctx.alter && val) || !ctx.dot || ctx.prec)
 		{
-			if (ctx.type == 16)
+			if (ctx.type >= 16)
 			{
-				u128 val2 = *reinterpret_cast<u128*>(val);
+				u128 val2 = *reinterpret_cast<const u128*>(val);
 				write_hex(val2, ch == 'X', ctx.prec);
 			}
 			else
@@ -576,9 +587,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}

-		if (!ctx.type)
+		const usz src_type = src.type(ctx.args);
+
+		if (!ctx.type || src_type > 8)
 		{
-			ctx.type = static_cast<u8>(src.type(ctx.args));
+			ctx.type = static_cast<u8>(src_type);

 			if (!ctx.type)
 			{
@@ -599,9 +612,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)

 		if (!ctx.dot || ctx.prec)
 		{
-			if (ctx.type == 16)
+			if (ctx.type >= 16)
 			{
-				u128 val2 = *reinterpret_cast<u128*>(val);
+				u128 val2 = *reinterpret_cast<const u128*>(val);
 				write_decimal(val2, ctx.prec);
 			}
 			else
@@ -700,6 +700,12 @@ template<typename T>
 struct size3_base
 {
 	T width, height, depth;
+
+	template<typename NT>
+	explicit constexpr operator size3_base<NT>() const
+	{
+		return{ static_cast<NT>(width), static_cast<NT>(height), static_cast<NT>(depth) };
+	}
 };

 template<typename T>
@@ -771,9 +777,9 @@ struct color4_base
 	};

 	constexpr color4_base()
-		: x{}
-		, y{}
-		, z{}
+		: x{ T{0} }
+		, y{ T{0} }
+		, z{ T{0} }
 		, w{ T(1) }
 	{
 	}
@@ -359,6 +359,14 @@ public:
 		return result;
 	}

+	// Withdraw the list in reverse order (LIFO/FILO)
+	lf_queue_slice<T> pop_all_reversed()
+	{
+		lf_queue_slice<T> result;
+		result.m_head = m_head.exchange(nullptr);
+		return result;
+	}
+
 	// Apply func(data) to each element, return the total length
 	template <typename F>
 	usz apply(F func)
@@ -6,14 +6,27 @@ void shared_mutex::imp_lock_shared(u32 val)
 {
 	ensure(val < c_err); // "shared_mutex underflow"

+	// Try to steal the notification bit
+	if (val & c_sig && m_value.compare_exchange(val, val - c_sig + 1))
+	{
+		return;
+	}
+
 	for (int i = 0; i < 10; i++)
 	{
-		busy_wait();
-
 		if (try_lock_shared())
 		{
 			return;
 		}
+
+		const u32 old = m_value;
+
+		if (old & c_sig && m_value.compare_and_swap_test(old, old - c_sig + 1))
+		{
+			return;
+		}
+
+		busy_wait();
 	}

 	// Acquire writer lock and downgrade
@@ -75,11 +88,24 @@ void shared_mutex::imp_lock(u32 val)
 {
 	ensure(val < c_err); // "shared_mutex underflow"

+	// Try to steal the notification bit
+	if (val & c_sig && m_value.compare_exchange(val, val - c_sig + c_one))
+	{
+		return;
+	}
+
 	for (int i = 0; i < 10; i++)
 	{
 		busy_wait();

-		if (!m_value && try_lock())
+		const u32 old = m_value;
+
+		if (!old && try_lock())
+		{
+			return;
+		}
+
+		if (old & c_sig && m_value.compare_and_swap_test(old, old - c_sig + c_one))
 		{
 			return;
 		}
@@ -171,6 +171,11 @@ public:
 	{
 		return m_value.load() < c_one - 1;
 	}
+
+	bool has_waiters() const
+	{
+		return m_value.load() > c_one;
+	}
 };

 // Simplified shared (reader) lock implementation.
@@ -5,54 +5,81 @@ rXmlNode::rXmlNode()
 {
 }

-rXmlNode::rXmlNode(const pugi::xml_node &node)
+rXmlNode::rXmlNode(const pugi::xml_node& node)
 {
 	handle = node;
 }

 std::shared_ptr<rXmlNode> rXmlNode::GetChildren()
 {
-	// it.begin() returns node_iterator*, *it.begin() return node*.
-	pugi::xml_object_range<pugi::xml_node_iterator> it = handle.children();
-	pugi::xml_node begin = *it.begin();
+	if (handle)
+	{
+		if (const pugi::xml_node child = handle.first_child())
+		{
+			return std::make_shared<rXmlNode>(child);
+		}
+	}

-	if (begin)
-	{
-		return std::make_shared<rXmlNode>(begin);
-	}
-	else
-	{
-		return nullptr;
-	}
+	return nullptr;
 }

 std::shared_ptr<rXmlNode> rXmlNode::GetNext()
 {
-	pugi::xml_node result = handle.next_sibling();
-	if (result)
+	if (handle)
 	{
-		return std::make_shared<rXmlNode>(result);
-	}
-	else
-	{
-		return nullptr;
+		if (const pugi::xml_node result = handle.next_sibling())
+		{
+			return std::make_shared<rXmlNode>(result);
+		}
 	}
+
+	return nullptr;
 }

 std::string rXmlNode::GetName()
 {
-	return handle.name();
+	if (handle)
+	{
+		if (const pugi::char_t* name = handle.name())
+		{
+			return name;
+		}
+	}
+
+	return {};
 }

-std::string rXmlNode::GetAttribute(const std::string &name)
+std::string rXmlNode::GetAttribute(const std::string& name)
 {
-	auto pred = [&name](pugi::xml_attribute attr) { return (name == attr.name()); };
-	return handle.find_attribute(pred).value();
+	if (handle)
+	{
+		const auto pred = [&name](const pugi::xml_attribute& attr) { return (name == attr.name()); };
+		if (const pugi::xml_attribute attr = handle.find_attribute(pred))
+		{
+			if (const pugi::char_t* value = attr.value())
+			{
+				return value;
+			}
+		}
+	}
+
+	return {};
 }

 std::string rXmlNode::GetNodeContent()
 {
-	return handle.text().get();
+	if (handle)
+	{
+		if (const pugi::xml_text text = handle.text())
+		{
+			if (const pugi::char_t* value = text.get())
+			{
+				return value;
+			}
+		}
+	}
+
+	return {};
 }

 rXmlDocument::rXmlDocument()
@@ -61,10 +88,20 @@ rXmlDocument::rXmlDocument()

 pugi::xml_parse_result rXmlDocument::Read(const std::string& data)
 {
-	return handle.load_buffer(data.data(), data.size());
+	if (handle)
+	{
+		return handle.load_buffer(data.data(), data.size());
+	}
+
+	return {};
 }

 std::shared_ptr<rXmlNode> rXmlDocument::GetRoot()
 {
-	return std::make_shared<rXmlNode>(handle.root());
+	if (const pugi::xml_node root = handle.root())
+	{
+		return std::make_shared<rXmlNode>(root);
+	}
+
+	return nullptr;
 }
@@ -19,11 +19,11 @@
 struct rXmlNode
 {
 	rXmlNode();
-	rXmlNode(const pugi::xml_node &);
+	rXmlNode(const pugi::xml_node& node);
 	std::shared_ptr<rXmlNode> GetChildren();
 	std::shared_ptr<rXmlNode> GetNext();
 	std::string GetName();
-	std::string GetAttribute(const std::string &name);
+	std::string GetAttribute(const std::string& name);
 	std::string GetNodeContent();

 	pugi::xml_node handle{};
--- a/Show More
+++ b/Show More