rpcs3_version: Bump to 0.0.10

- merge disable_asynchronous_shader_compiler and interpreter_mode
- removes disable_asynchronous_shader_compiler setting
- Adds the resulting settings as radio buttons to the gui tab

.ci/build-linux.sh

@@ -0,0 +1,66 @@
+#!/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
+
+cd rpcs3 || exit 1
+
+# 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 $(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
+
+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 LINKER=gold
+    # We need to set the following variables for LTO to link properly
+    export AR=/usr/bin/gcc-ar-9
+    export RANLIB=/usr/bin/gcc-ranlib-9
+    export CFLAGS="-fuse-linker-plugin"
+else
+    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
+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"                          \
+    -DCMAKE_CXX_FLAGS="$CFLAGS"                        \
+    -DCMAKE_AR="$AR"                                   \
+    -DCMAKE_RANLIB="$RANLIB"                           \
+    -G Ninja
+
+ninja; build_status=$?;
+
+cd ..
+
+# If it compiled succesfully let's deploy depending on the build pipeline (Travis, Azure Pipelines).
+# Travis only deploys on master, and it publishes to GitHub releases. Azure publishes PRs as artifacts
+# only.
+{   [ "$IS_AZURE" = "true" ] ||
+    { [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; };
+} && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
+
+if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
+    .ci/deploy-linux.sh
+fi

.ci/build-mac.sh

@@ -1,3 +1,5 @@
+#!/bin/sh -ex
+
 export CCACHE_SLOPPINESS=pch_defines,time_macros
 export CMAKE_PREFIX_PATH=/usr/local/opt/qt5/
 export PATH="/usr/local/opt/ccache/libexec:$PATH"
@@ -8,15 +10,18 @@ unzip -: gfx-portability-macos-latest.zip
 curl -sLO https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.106.0.zip
 unzip -: sdk-*.zip
 mkdir vulkan-sdk
-ln -s ${PWD}/Vulkan-Headers*/include vulkan-sdk/include
+ln -s "${PWD}"/Vulkan-Headers*/include vulkan-sdk/include
 mkdir vulkan-sdk/lib
 cp target/release/libportability.dylib vulkan-sdk/lib/libVulkan.dylib
 # Let macdeployqt locate and install Vulkan library
-install_name_tool -id ${PWD}/vulkan-sdk/lib/libVulkan.dylib vulkan-sdk/lib/libVulkan.dylib
-export VULKAN_SDK=${PWD}/vulkan-sdk
+install_name_tool -id "${PWD}"/vulkan-sdk/lib/libVulkan.dylib vulkan-sdk/lib/libVulkan.dylib
+export VULKAN_SDK="${PWD}/vulkan-sdk"
 
-git submodule update --quiet --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/span 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/libusb 3rdparty/xxHash 3rdparty/yaml-cpp 3rdparty/FAudio Vulkan/glslang
+# 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)
 
-mkdir build; cd build
+mkdir build && cd build || exit 1
 cmake .. -DWITH_LLVM=OFF -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja
 ninja

.ci/deploy-linux.sh

@@ -0,0 +1,67 @@
+#!/bin/sh -ex
+
+cd build || exit 1
+
+if [ "$DEPLOY_APPIMAGE" = "true" ]; then
+    DESTDIR=appdir ninja install
+    QT_APPIMAGE="linuxdeployqt.AppImage"
+
+    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
+    rm ./appdir/usr/lib/libxcb*
+    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}
+
+    # 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++/
+    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
+
+    # Compile checker binary for AppImageKit-checkrt
+
+    # 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.26 and CXXABI_1.3.11
+    printf "#include <bits/stdc++.h>\nint main(){std::make_exception_ptr(0);std::pmr::get_default_resource();}" | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker -
+
+    # Package it up and send it off
+    ./squashfs-root/usr/bin/appimagetool /rpcs3/build/appdir
+    ls
+
+    COMM_TAG="$(grep 'version{.*}' ../rpcs3/rpcs3_version.cpp | awk -F[\{,] '{printf "%d.%d.%d", $2, $3, $4}')"
+    COMM_COUNT="$(git rev-list --count HEAD)"
+    COMM_HASH="$(git rev-parse --short=8 HEAD)"
+    RPCS3_APPIMAGE="rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_linux64.AppImage"
+
+    curl -sLO https://github.com/hcorion/uploadtool/raw/master/upload.sh
+    mv ./RPCS3*.AppImage "$RPCS3_APPIMAGE"
+
+    # If we're building using Azure Pipelines, let's copy over the AppImage artifact
+    if [ -n "$BUILD_ARTIFACTSTAGINGDIRECTORY" ]; then
+        cp "$RPCS3_APPIMAGE" ~/artifacts
+    fi
+
+    FILESIZE=$(stat -c %s ./rpcs3*.AppImage)
+    SHA256SUM=$(sha256sum ./rpcs3*.AppImage)
+    if [ -n "$GITHUB_TOKEN" ]; then
+        unset TRAVIS_REPO_SLUG
+        REPO_SLUG=RPCS3/rpcs3-binaries-linux \
+            UPLOADTOOL_BODY="$SHA256SUM;${FILESIZE}B"\
+            RELEASE_NAME=build-${TRAVIS_COMMIT}\
+            RELEASE_TITLE=${COMM_TAG}-${COMM_COUNT}\
+            REPO_COMMIT=d812f1254a1157c80fd402f94446310560f54e5f\
+            bash upload.sh rpcs3*.AppImage
+    fi
+fi
+
+if [ "$DEPLOY_PPA" = "true" ]; then
+    export DEBFULLNAME="RPCS3 Build Bot"
+fi

.ci/deploy-windows.sh

@@ -0,0 +1,24 @@
+#!/bin/sh -ex
+
+# BUILD_blablabla is Azure specific, so we wrap it for portability
+ARTIFACT_DIR="$BUILD_ARTIFACTSTAGINGDIRECTORY"
+
+# Remove unecessary files
+rm -f ./bin/rpcs3.exp ./bin/rpcs3.lib ./bin/rpcs3.pdb
+
+# Prepare compatibility database for packaging, as well as
+# certificate for ssl (auto-updater)
+curl -sL 'https://rpcs3.net/compatibility?api=v1&export' | iconv -t UTF-8 > ./bin/GuiConfigs/compat_database.dat
+curl -sL 'https://curl.haxx.se/ca/cacert.pem' > ./bin/cacert.pem
+
+# Package artifacts
+7z a -m0=LZMA2 -mx9 "$BUILD" ./bin/*
+
+# Generate sha256 hashes
+# Write to file for GitHub releases
+sha256sum "$BUILD" | awk '{ print $1 }' | tee "$BUILD.sha256"
+echo "$(cat "$BUILD.sha256");$(stat -c %s "$BUILD")B" > GitHubReleaseMessage.txt
+
+# Move files to publishing directory
+mv -- "$BUILD" "$ARTIFACT_DIR"
+mv -- "$BUILD.sha256" "$ARTIFACT_DIR"

.ci/export-azure-vars.sh

@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+# Export variables for later stages of the Azure pipeline
+# Values done in this manner will appear as environment variables
+# in later stages.
+
+# From pure-sh-bible
+# Setting 'IFS' tells 'read' where to split the string.
+while IFS='=' read -r key val; do
+    # Skip over lines containing comments.
+    [ "${key##\#*}" ] || continue
+    echo "##vso[task.setvariable variable=$key]$val"
+done < ".ci/azure-vars.env"

.ci/setup-windows.sh

@@ -0,0 +1,114 @@
+#!/bin/sh -ex
+
+# These are Azure specific, so we wrap them for portability
+REPO_NAME="$BUILD_REPOSITORY_NAME"
+REPO_BRANCH="$SYSTEM_PULLREQUEST_SOURCEBRANCH"
+PR_NUMBER="$SYSTEM_PULLREQUEST_PULLREQUESTID"
+
+# Resource/dependency URLs
+# Qt mirrors can be volatile and slow, so we list 2
+#QT_HOST="http://mirrors.ocf.berkeley.edu/qt/"
+QT_HOST="http://qt.mirror.constant.com/"
+QT_URL_VER=$(echo "$QT_VER" | sed "s/\.//g")
+QT_PREFIX="online/qtsdkrepository/windows_x86/desktop/qt5_${QT_URL_VER}/qt.qt5.${QT_URL_VER}.win64_msvc2017_64/${QT_VER}-0-${QT_DATE}"
+QT_SUFFIX="-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z"
+QT_BASE_URL="${QT_HOST}${QT_PREFIX}qtbase${QT_SUFFIX}"
+QT_WINE_URL="${QT_HOST}${QT_PREFIX}qtwinextras${QT_SUFFIX}"
+QT_DECL_URL="${QT_HOST}${QT_PREFIX}qtdeclarative${QT_SUFFIX}"
+QT_TOOL_URL="${QT_HOST}${QT_PREFIX}qttools${QT_SUFFIX}"
+LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z'
+GLSLANG_URL='https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z'
+VULKAN_SDK_URL="https://sdk.lunarg.com/sdk/download/${VULKAN_VER}/windows/VulkanSDK-${VULKAN_VER}-Installer.exe"
+
+DEP_URLS="         \
+    $QT_BASE_URL   \
+    $QT_WINE_URL   \
+    $QT_DECL_URL   \
+    $QT_TOOL_URL   \
+    $LLVMLIBS_URL  \
+    $GLSLANG_URL   \
+    $VULKAN_SDK_URL"
+
+# Azure pipelines doesn't make a cache dir if it doesn't exist, so we do it manually
+[ -d "$CACHE_DIR" ] || mkdir "$CACHE_DIR"
+
+# 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 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
+
+# Git bash doesn't have rev, so here it is
+rev()
+{
+    echo "$1" | awk '{ for(i = length($0); i != 0; --i) { a = a substr($0, i, 1); } } END { print a }'
+}
+
+# Usage: download_and_verify url checksum algo file
+# Check to see if a file is already cached, and the checksum matches. If not, download it.
+# Tries up to 3 times
+download_and_verify()
+{
+    url="$1"
+    correctChecksum="$2"
+    algo="$3"
+    fileName="$4"
+
+    for _ in 1 2 3; do
+        [ -e "$CACHE_DIR/$fileName" ] || curl -L -o "$CACHE_DIR/$fileName" "$url"
+        fileChecksum=$("${algo}sum" "$CACHE_DIR/$fileName" | awk '{ print $1 }')
+        [ "$fileChecksum" = "$correctChecksum" ] && return 0
+        rm "$CACHE_DIR/$fileName"
+    done
+
+    return 1;
+}
+
+# Some dependencies install here
+[ -d "./lib" ] || mkdir "./lib"
+
+for url in $DEP_URLS; do
+    # Get the filename from the URL. Breaks if urls have js args, so don't do that pls
+    fileName="$(rev "$(rev "$url" | cut -d'/' -f1)")"
+    [ -z "$fileName" ] && echo "Unable to parse url: $url" && exit 1
+
+    # 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="." ;;
+    *glslang*) checksum=$(curl -L "${url}.sha256"); algo="sha256"; outDir="./lib/Release - LLVM-x64" ;;
+    *Vulkan*)
+        # Vulkan setup needs to be run in batch environment
+        # Need to subshell this or else it doesn't wait
+        download_and_verify "$url" "$VULKAN_SDK_SHA" "sha256" "$fileName"
+        cp "$CACHE_DIR/$fileName" .
+        _=$(echo "$fileName /S" | cmd)
+        continue
+    ;;
+    *) echo "Unknown url resource: $url"; exit 1 ;;
+    esac
+
+    download_and_verify "$url" "$checksum" "$algo" "$fileName"
+    7z x -y "$CACHE_DIR/$fileName" -aos -o"$outDir"
+done
+
+# Gather explicit version number and number of commits
+COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
+COMM_COUNT=$(git rev-list --count HEAD)
+COMM_HASH=$(git rev-parse --short=8 HEAD)
+
+# Format the above into filenames
+if [ -n "$PR_NUMBER" ]; then
+    AVVER="${COMM_TAG}-${COMM_HASH}"
+    BUILD="rpcs3-v${AVVER}_win64.7z"
+else
+    AVVER="${COMM_TAG}-${COMM_COUNT}"
+    BUILD="rpcs3-v${AVVER}-${COMM_HASH}_win64.7z"
+fi
+
+# BRANCH is used for experimental build warnings for pr builds, used in main_window.cpp.
+# BUILD is the name of the release artifact
+# AVVER is used for GitHub releases, it is the version number.
+BRANCH="${REPO_NAME}/${REPO_BRANCH}"
+echo "BRANCH=$BRANCH" > .ci/azure-vars.env
+echo "BUILD=$BUILD" >> .ci/azure-vars.env
+echo "AVVER=$AVVER" >> .ci/azure-vars.env

.ci/travis.env

@@ -2,6 +2,13 @@
 TRAVIS_PULL_REQUEST
 TRAVIS_BRANCH
 TRAVIS_COMMIT
+# Variables set by Azure Pipelines
+IS_AZURE
+BUILD_REASON
+BUILD_SOURCEVERSION
+BUILD_ARTIFACTSTAGINGDIRECTORY
+BUILD_REPOSITORY_NAME
+BUILD_SOURCEBRANCHNAME
 # Variables for Travis build matrix
 COMPILER
 DEPLOY_APPIMAGE

.gitignore

@@ -108,3 +108,10 @@ CMakeLists.txt.user
 
 # yaml-cpp
 yaml-cpp.pc
+
+# libusb
+/3rdparty/libusb_cmake/config.h
+/3rdparty/libusb_cmake/libusb-1.0.pc
+
+# ssl certificate
+cacert.pem

.gitmodules

@@ -8,7 +8,7 @@
 	ignore = dirty
 [submodule "llvm"]
 	path = llvm
-	url = https://github.com/RPCS3/llvm
+	url = https://github.com/RPCS3/llvm-mirror
 	ignore = dirty
 [submodule "Vulkan/glslang"]
 	path = Vulkan/glslang
@@ -16,7 +16,7 @@
 	ignore = dirty
 [submodule "3rdparty/cereal"]
 	path = 3rdparty/cereal
-	url = https://github.com/USCiLab/cereal.git
+	url = https://github.com/RPCS3/cereal.git
 	ignore = dirty
 [submodule "3rdparty/zlib"]
 	path = 3rdparty/zlib
@@ -37,7 +37,7 @@
 	ignore = dirty
 [submodule "3rdparty/yaml-cpp"]
 	path = 3rdparty/yaml-cpp
-	url = https://github.com/jbeder/yaml-cpp.git
+	url = https://github.com/RPCS3/yaml-cpp.git
 	ignore = dirty
 [submodule "3rdparty/libpng"]
 	path = 3rdparty/libpng
@@ -55,3 +55,12 @@
 	path = 3rdparty/span
 	url = https://github.com/tcbrindle/span
 	ignore = dirty
+[submodule "3rdparty/curl"]
+	path = 3rdparty/curl
+	url = https://github.com/RipleyTom/curl.git
+	ignore = dirty
+[submodule "3rdparty/wolfssl"]
+	path = 3rdparty/wolfssl
+	url = https://github.com/RipleyTom/wolfssl.git
+	ignore = dirty
+

.travis.yml

@@ -11,7 +11,7 @@ jobs:
           cache: ccache
           compiler: gcc
           install: "docker pull rpcs3/rpcs3-travis-xenial:1.2"
-          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.2 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
+          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.2 /rpcs3/.ci/build-linux.sh'
         - os: linux
           dist: xenial
           env:
@@ -21,18 +21,18 @@ jobs:
           cache: ccache
           compiler: clang
           install: "docker pull rpcs3/rpcs3-travis-xenial:1.2"
-          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.2 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
-        - os: osx
-          osx_image: xcode11.3
-          addons:
-            homebrew:
-                packages:
-                    - ccache
-                    - glew
-                    - ninja
-                    - qt
-          script: "/bin/bash -ex .travis/build-mac.bash"
-          cache: ccache
+          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.2 /rpcs3/.ci/build-linux.sh'
+        # - os: osx
+        #   osx_image: xcode11.3
+        #   addons:
+        #     homebrew:
+        #         packages:
+        #             - ccache
+        #             - glew
+        #             - ninja
+        #             - qt
+        #   script: "/bin/bash -ex .ci/build-mac.sh"
+        #   cache: ccache
     allow_failures:
         - os: osx
 

.travis/build-linux.bash

@@ -1,35 +0,0 @@
-#!/bin/env bash -ex
-shopt -s nocasematch
-
-# 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
-
-cd rpcs3
-
-git submodule update --quiet --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/span 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/xxHash 3rdparty/yaml-cpp 3rdparty/libusb 3rdparty/FAudio Vulkan/glslang
-
-# Download pre-compiled llvm libs
-curl -sLO https://github.com/RPCS3/llvm/releases/download/continuous-linux-master/llvmlibs-linux.tar.gz
-mkdir llvmlibs
-tar -xzf ./llvmlibs-linux.tar.gz -C llvmlibs
-
-mkdir build ; cd build
-
-if [ $COMPILER = "gcc" ]; then
-	# These are set in the dockerfile
-	export CC=${GCC_BINARY}
-	export CXX=${GXX_BINARY}
-else
-	export CC=${CLANG_BINARY}
-	export CXX=${CLANGXX_BINARY}
-fi
-
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LLVM_SUBMODULE=OFF -DUSE_COTIRE=OFF -DLLVM_DIR=llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja
-
-ninja; build_status=$?;
-
-cd ..
-# If it compiled succesfully let's deploy
-if [ $build_status -eq 0 ] && [ -n "$GITHUB_TOKEN" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then /bin/bash -ex .travis/deploy-linux.bash ; fi

.travis/deploy-linux.bash

@@ -1,54 +0,0 @@
-#!/bin/env bash -ex
-shopt -s nocasematch
-cd build
-if [ "$DEPLOY_APPIMAGE" = "true" ]; then
-	DESTDIR=appdir ninja install
-	curl -sLO "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-	chmod a+x linuxdeployqt*.AppImage
-	./linuxdeployqt*.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
-	rm ./appdir/usr/lib/libxcb*
-	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}
-
-	# 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++/
-	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
-	
-	# Compile checker binary for AppImageKit-checkrt
-	
-	# 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.26 and CXXABI_1.3.11
-	printf "#include <bits/stdc++.h>\nint main(){std::make_exception_ptr(0);std::pmr::get_default_resource();}" | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker -
-	
-	# Package it up and send it off
-	./squashfs-root/usr/bin/appimagetool /rpcs3/build/appdir
-	ls
-	COMM_TAG="$(grep 'version{.*}' ../rpcs3/rpcs3_version.cpp | awk -F[{,] '{printf "%d.%d.%d", $2, $3, $4}')"
-	COMM_COUNT="$(git rev-list --count HEAD)"
-	curl -sLO https://github.com/hcorion/uploadtool/raw/master/upload.sh
-	
-	mv ./RPCS3*.AppImage rpcs3-v${COMM_TAG}-${COMM_COUNT}-${TRAVIS_COMMIT:0:8}_linux64.AppImage
-	
-	FILESIZE=($(stat -c %s ./rpcs3*.AppImage))
-	SHA256SUM=($(sha256sum ./rpcs3*.AppImage))
-	
-	unset TRAVIS_REPO_SLUG
-	REPO_SLUG=RPCS3/rpcs3-binaries-linux \
-		UPLOADTOOL_BODY="$SHA256SUM;${FILESIZE}B"\
-		RELEASE_NAME=build-${TRAVIS_COMMIT}\
-		RELEASE_TITLE=${COMM_TAG}-${COMM_COUNT}\
-		REPO_COMMIT=d812f1254a1157c80fd402f94446310560f54e5f\
-		bash upload.sh rpcs3*.AppImage
-fi
-if [ "$DEPLOY_PPA" = "true" ]; then
-	export DEBFULLNAME="RPCS3 Build Bot"
-fi

3rdparty/CMakeLists.txt

@@ -413,6 +413,18 @@ endif()
 # LLVM
 include(llvm.cmake)
 
+# CURL
+if(USE_SYSTEM_CURL)
+	message("-- RPCS3: using shared libcurl")
+	find_package(CURL REQUIRED)
+	add_library(wolfssl-3-static INTERFACE)
+	add_library(libcurl INTERFACE)
+	target_link_libraries(libcurl INTERFACE CURL::libcurl)
+else()
+	message("-- RPCS3: building libcurl + wolfssl submodules")
+	add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
+	add_subdirectory(curl EXCLUDE_FROM_ALL)
+endif()
 
 # add nice ALIAS targets for ease of use
 add_library(3rdparty::libusb ALIAS usb-1.0-static)
@@ -436,3 +448,5 @@ add_library(3rdparty::vulkan ALIAS ${VULKAN_TARGET})
 add_library(3rdparty::openal ALIAS 3rdparty_openal)
 add_library(3rdparty::ffmpeg ALIAS 3rdparty_ffmpeg)
 add_library(3rdparty::glew ALIAS 3rdparty_glew)
+add_library(3rdparty::wolfssl ALIAS wolfssl-3-static)
+add_library(3rdparty::libcurl ALIAS libcurl)

3rdparty/discord-rpc/include/discord_register.h

@@ -1,17 +1,17 @@
 #pragma once
 
 #if defined(DISCORD_DYNAMIC_LIB)
-#  if defined(_WIN32)
-#    if defined(DISCORD_BUILDING_SDK)
-#      define DISCORD_EXPORT __declspec(dllexport)
-#    else
-#      define DISCORD_EXPORT __declspec(dllimport)
-#    endif
-#  else
-#    define DISCORD_EXPORT __attribute__((visibility("default")))
-#  endif
+#if defined(_WIN32)
+#if defined(DISCORD_BUILDING_SDK)
+#define DISCORD_EXPORT __declspec(dllexport)
 #else
-#  define DISCORD_EXPORT
+#define DISCORD_EXPORT __declspec(dllimport)
+#endif
+#else
+#define DISCORD_EXPORT __attribute__((visibility("default")))
+#endif
+#else
+#define DISCORD_EXPORT
 #endif
 
 #ifdef __cplusplus

3rdparty/discord-rpc/include/discord_rpc.h

@@ -41,20 +41,20 @@ typedef struct DiscordRichPresence {
     int8_t instance;
 } DiscordRichPresence;
 
-typedef struct DiscordJoinRequest {
+typedef struct DiscordUser {
     const char* userId;
     const char* username;
     const char* discriminator;
     const char* avatar;
-} DiscordJoinRequest;
+} DiscordUser;
 
 typedef struct DiscordEventHandlers {
-    void (*ready)(void);
+    void (*ready)(const DiscordUser* request);
     void (*disconnected)(int errorCode, const char* message);
     void (*errored)(int errorCode, const char* message);
     void (*joinGame)(const char* joinSecret);
     void (*spectateGame)(const char* spectateSecret);
-    void (*joinRequest)(const DiscordJoinRequest* request);
+    void (*joinRequest)(const DiscordUser* request);
 } DiscordEventHandlers;
 
 #define DISCORD_REPLY_NO 0

3rdparty/hidapi.vcxproj

@@ -55,7 +55,6 @@
       <AdditionalIncludeDirectories>hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>

3rdparty/libcurl.vcxproj

@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug - LLVM|x64">
+      <Configuration>Debug - LLVM</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - LLVM|x64">
+      <Configuration>Release - LLVM</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}</ProjectGuid>
+    <RootNamespace>libcurl</RootNamespace>
+  </PropertyGroup>
+  <Import Project="..\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </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" />
+  </ImportGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>curl\include;curl\lib;wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_SNI;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WOLFSSL;USE_IPV6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="curl\lib\altsvc.c" />
+    <ClCompile Include="curl\lib\amigaos.c" />
+    <ClCompile Include="curl\lib\asyn-ares.c" />
+    <ClCompile Include="curl\lib\asyn-thread.c" />
+    <ClCompile Include="curl\lib\base64.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_memrchr.c" />
+    <ClCompile Include="curl\lib\curl_multibyte.c" />
+    <ClCompile Include="curl\lib\curl_ntlm_core.c" />
+    <ClCompile Include="curl\lib\curl_ntlm_wb.c" />
+    <ClCompile Include="curl\lib\curl_path.c" />
+    <ClCompile Include="curl\lib\curl_range.c" />
+    <ClCompile Include="curl\lib\curl_rtmp.c" />
+    <ClCompile Include="curl\lib\curl_sasl.c" />
+    <ClCompile Include="curl\lib\curl_sspi.c" />
+    <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\easy.c" />
+    <ClCompile Include="curl\lib\escape.c" />
+    <ClCompile Include="curl\lib\file.c" />
+    <ClCompile Include="curl\lib\fileinfo.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\hash.c" />
+    <ClCompile Include="curl\lib\hmac.c" />
+    <ClCompile Include="curl\lib\hostasyn.c" />
+    <ClCompile Include="curl\lib\hostcheck.c" />
+    <ClCompile Include="curl\lib\hostip.c" />
+    <ClCompile Include="curl\lib\hostip4.c" />
+    <ClCompile Include="curl\lib\hostip6.c" />
+    <ClCompile Include="curl\lib\hostsyn.c" />
+    <ClCompile Include="curl\lib\http.c" />
+    <ClCompile Include="curl\lib\http2.c" />
+    <ClCompile Include="curl\lib\http_chunks.c" />
+    <ClCompile Include="curl\lib\http_digest.c" />
+    <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\if2ip.c" />
+    <ClCompile Include="curl\lib\imap.c" />
+    <ClCompile Include="curl\lib\inet_ntop.c" />
+    <ClCompile Include="curl\lib\inet_pton.c" />
+    <ClCompile Include="curl\lib\krb5.c" />
+    <ClCompile Include="curl\lib\ldap.c" />
+    <ClCompile Include="curl\lib\llist.c" />
+    <ClCompile Include="curl\lib\md4.c" />
+    <ClCompile Include="curl\lib\md5.c" />
+    <ClCompile Include="curl\lib\memdebug.c" />
+    <ClCompile Include="curl\lib\mime.c" />
+    <ClCompile Include="curl\lib\mprintf.c" />
+    <ClCompile Include="curl\lib\multi.c" />
+    <ClCompile Include="curl\lib\netrc.c" />
+    <ClCompile Include="curl\lib\non-ascii.c" />
+    <ClCompile Include="curl\lib\nonblock.c" />
+    <ClCompile Include="curl\lib\nwlib.c" />
+    <ClCompile Include="curl\lib\nwos.c" />
+    <ClCompile Include="curl\lib\openldap.c" />
+    <ClCompile Include="curl\lib\parsedate.c" />
+    <ClCompile Include="curl\lib\pingpong.c" />
+    <ClCompile Include="curl\lib\pop3.c" />
+    <ClCompile Include="curl\lib\progress.c" />
+    <ClCompile Include="curl\lib\psl.c" />
+    <ClCompile Include="curl\lib\rand.c" />
+    <ClCompile Include="curl\lib\rename.c" />
+    <ClCompile Include="curl\lib\rtsp.c" />
+    <ClCompile Include="curl\lib\security.c" />
+    <ClCompile Include="curl\lib\select.c" />
+    <ClCompile Include="curl\lib\sendf.c" />
+    <ClCompile Include="curl\lib\setopt.c" />
+    <ClCompile Include="curl\lib\sha256.c" />
+    <ClCompile Include="curl\lib\share.c" />
+    <ClCompile Include="curl\lib\slist.c" />
+    <ClCompile Include="curl\lib\smb.c" />
+    <ClCompile Include="curl\lib\smtp.c" />
+    <ClCompile Include="curl\lib\socketpair.c" />
+    <ClCompile Include="curl\lib\socks.c" />
+    <ClCompile Include="curl\lib\socks_gssapi.c" />
+    <ClCompile Include="curl\lib\socks_sspi.c" />
+    <ClCompile Include="curl\lib\speedcheck.c" />
+    <ClCompile Include="curl\lib\splay.c" />
+    <ClCompile Include="curl\lib\strcase.c" />
+    <ClCompile Include="curl\lib\strdup.c" />
+    <ClCompile Include="curl\lib\strerror.c" />
+    <ClCompile Include="curl\lib\strtok.c" />
+    <ClCompile Include="curl\lib\strtoofft.c" />
+    <ClCompile Include="curl\lib\system_win32.c" />
+    <ClCompile Include="curl\lib\telnet.c" />
+    <ClCompile Include="curl\lib\tftp.c" />
+    <ClCompile Include="curl\lib\timeval.c" />
+    <ClCompile Include="curl\lib\transfer.c" />
+    <ClCompile Include="curl\lib\url.c" />
+    <ClCompile Include="curl\lib\urlapi.c" />
+    <ClCompile Include="curl\lib\version.c" />
+    <ClCompile Include="curl\lib\warnless.c" />
+    <ClCompile Include="curl\lib\wildcard.c" />
+    <ClCompile Include="curl\lib\x509asn1.c" />
+    <ClCompile Include="curl\lib\vauth\cleartext.c" />
+    <ClCompile Include="curl\lib\vauth\cram.c" />
+    <ClCompile Include="curl\lib\vauth\digest.c" />
+    <ClCompile Include="curl\lib\vauth\digest_sspi.c" />
+    <ClCompile Include="curl\lib\vauth\krb5_gssapi.c" />
+    <ClCompile Include="curl\lib\vauth\krb5_sspi.c" />
+    <ClCompile Include="curl\lib\vauth\ntlm.c" />
+    <ClCompile Include="curl\lib\vauth\ntlm_sspi.c" />
+    <ClCompile Include="curl\lib\vauth\oauth2.c" />
+    <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\vssh\libssh.c" />
+    <ClCompile Include="curl\lib\vssh\libssh2.c" />
+    <ClCompile Include="curl\lib\vssh\wolfssh.c" />
+    <ClCompile Include="curl\lib\vtls\bearssl.c" />
+    <ClCompile Include="curl\lib\vtls\gskit.c" />
+    <ClCompile Include="curl\lib\vtls\gtls.c" />
+    <ClCompile Include="curl\lib\vtls\mbedtls.c" />
+    <ClCompile Include="curl\lib\vtls\mbedtls_threadlock.c" />
+    <ClCompile Include="curl\lib\vtls\mesalink.c" />
+    <ClCompile Include="curl\lib\vtls\nss.c" />
+    <ClCompile Include="curl\lib\vtls\openssl.c" />
+    <ClCompile Include="curl\lib\vtls\schannel.c" />
+    <ClCompile Include="curl\lib\vtls\schannel_verify.c" />
+    <ClCompile Include="curl\lib\vtls\sectransp.c" />
+    <ClCompile Include="curl\lib\vtls\vtls.c" />
+    <ClCompile Include="curl\lib\vtls\wolfssl.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="curl\include\curl\curl.h" />
+    <ClInclude Include="curl\include\curl\curlver.h" />
+    <ClInclude Include="curl\include\curl\easy.h" />
+    <ClInclude Include="curl\include\curl\mprintf.h" />
+    <ClInclude Include="curl\include\curl\multi.h" />
+    <ClInclude Include="curl\include\curl\stdcheaders.h" />
+    <ClInclude Include="curl\include\curl\system.h" />
+    <ClInclude Include="curl\include\curl\typecheck-gcc.h" />
+    <ClInclude Include="curl\include\curl\urlapi.h" />
+    <ClInclude Include="curl\lib\altsvc.h" />
+    <ClInclude Include="curl\lib\amigaos.h" />
+    <ClInclude Include="curl\lib\arpa_telnet.h" />
+    <ClInclude Include="curl\lib\asyn.h" />
+    <ClInclude Include="curl\lib\config-amigaos.h" />
+    <ClInclude Include="curl\lib\config-dos.h" />
+    <ClInclude Include="curl\lib\config-mac.h" />
+    <ClInclude Include="curl\lib\config-os400.h" />
+    <ClInclude Include="curl\lib\config-plan9.h" />
+    <ClInclude Include="curl\lib\config-riscos.h" />
+    <ClInclude Include="curl\lib\config-symbian.h" />
+    <ClInclude Include="curl\lib\config-tpf.h" />
+    <ClInclude Include="curl\lib\config-vxworks.h" />
+    <ClInclude Include="curl\lib\config-win32.h" />
+    <ClInclude Include="curl\lib\config-win32ce.h" />
+    <ClInclude Include="curl\lib\conncache.h" />
+    <ClInclude Include="curl\lib\connect.h" />
+    <ClInclude Include="curl\lib\content_encoding.h" />
+    <ClInclude Include="curl\lib\cookie.h" />
+    <ClInclude Include="curl\lib\curlx.h" />
+    <ClInclude Include="curl\lib\curl_addrinfo.h" />
+    <ClInclude Include="curl\lib\curl_base64.h" />
+    <ClInclude Include="curl\lib\curl_ctype.h" />
+    <ClInclude Include="curl\lib\curl_des.h" />
+    <ClInclude Include="curl\lib\curl_endian.h" />
+    <ClInclude Include="curl\lib\curl_fnmatch.h" />
+    <ClInclude Include="curl\lib\curl_gethostname.h" />
+    <ClInclude Include="curl\lib\curl_get_line.h" />
+    <ClInclude Include="curl\lib\curl_gssapi.h" />
+    <ClInclude Include="curl\lib\curl_hmac.h" />
+    <ClInclude Include="curl\lib\curl_ldap.h" />
+    <ClInclude Include="curl\lib\curl_md4.h" />
+    <ClInclude Include="curl\lib\curl_md5.h" />
+    <ClInclude Include="curl\lib\curl_memory.h" />
+    <ClInclude Include="curl\lib\curl_memrchr.h" />
+    <ClInclude Include="curl\lib\curl_multibyte.h" />
+    <ClInclude Include="curl\lib\curl_ntlm_core.h" />
+    <ClInclude Include="curl\lib\curl_ntlm_wb.h" />
+    <ClInclude Include="curl\lib\curl_path.h" />
+    <ClInclude Include="curl\lib\curl_printf.h" />
+    <ClInclude Include="curl\lib\curl_range.h" />
+    <ClInclude Include="curl\lib\curl_rtmp.h" />
+    <ClInclude Include="curl\lib\curl_sasl.h" />
+    <ClInclude Include="curl\lib\curl_sec.h" />
+    <ClInclude Include="curl\lib\curl_setup.h" />
+    <ClInclude Include="curl\lib\curl_setup_once.h" />
+    <ClInclude Include="curl\lib\curl_sha256.h" />
+    <ClInclude Include="curl\lib\curl_sspi.h" />
+    <ClInclude Include="curl\lib\curl_threads.h" />
+    <ClInclude Include="curl\lib\dict.h" />
+    <ClInclude Include="curl\lib\doh.h" />
+    <ClInclude Include="curl\lib\dotdot.h" />
+    <ClInclude Include="curl\lib\easyif.h" />
+    <ClInclude Include="curl\lib\escape.h" />
+    <ClInclude Include="curl\lib\file.h" />
+    <ClInclude Include="curl\lib\fileinfo.h" />
+    <ClInclude Include="curl\lib\formdata.h" />
+    <ClInclude Include="curl\lib\ftp.h" />
+    <ClInclude Include="curl\lib\ftplistparser.h" />
+    <ClInclude Include="curl\lib\getinfo.h" />
+    <ClInclude Include="curl\lib\gopher.h" />
+    <ClInclude Include="curl\lib\hash.h" />
+    <ClInclude Include="curl\lib\hostcheck.h" />
+    <ClInclude Include="curl\lib\hostip.h" />
+    <ClInclude Include="curl\lib\http.h" />
+    <ClInclude Include="curl\lib\http2.h" />
+    <ClInclude Include="curl\lib\http_chunks.h" />
+    <ClInclude Include="curl\lib\http_digest.h" />
+    <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\if2ip.h" />
+    <ClInclude Include="curl\lib\imap.h" />
+    <ClInclude Include="curl\lib\inet_ntop.h" />
+    <ClInclude Include="curl\lib\inet_pton.h" />
+    <ClInclude Include="curl\lib\llist.h" />
+    <ClInclude Include="curl\lib\memdebug.h" />
+    <ClInclude Include="curl\lib\mime.h" />
+    <ClInclude Include="curl\lib\multihandle.h" />
+    <ClInclude Include="curl\lib\multiif.h" />
+    <ClInclude Include="curl\lib\netrc.h" />
+    <ClInclude Include="curl\lib\non-ascii.h" />
+    <ClInclude Include="curl\lib\nonblock.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" />
+    <ClInclude Include="curl\lib\select.h" />
+    <ClInclude Include="curl\lib\sendf.h" />
+    <ClInclude Include="curl\lib\setopt.h" />
+    <ClInclude Include="curl\lib\setup-os400.h" />
+    <ClInclude Include="curl\lib\setup-vms.h" />
+    <ClInclude Include="curl\lib\share.h" />
+    <ClInclude Include="curl\lib\sigpipe.h" />
+    <ClInclude Include="curl\lib\slist.h" />
+    <ClInclude Include="curl\lib\smb.h" />
+    <ClInclude Include="curl\lib\smtp.h" />
+    <ClInclude Include="curl\lib\sockaddr.h" />
+    <ClInclude Include="curl\lib\socketpair.h" />
+    <ClInclude Include="curl\lib\socks.h" />
+    <ClInclude Include="curl\lib\speedcheck.h" />
+    <ClInclude Include="curl\lib\splay.h" />
+    <ClInclude Include="curl\lib\strcase.h" />
+    <ClInclude Include="curl\lib\strdup.h" />
+    <ClInclude Include="curl\lib\strerror.h" />
+    <ClInclude Include="curl\lib\strtok.h" />
+    <ClInclude Include="curl\lib\strtoofft.h" />
+    <ClInclude Include="curl\lib\system_win32.h" />
+    <ClInclude Include="curl\lib\telnet.h" />
+    <ClInclude Include="curl\lib\tftp.h" />
+    <ClInclude Include="curl\lib\timeval.h" />
+    <ClInclude Include="curl\lib\transfer.h" />
+    <ClInclude Include="curl\lib\url.h" />
+    <ClInclude Include="curl\lib\urlapi-int.h" />
+    <ClInclude Include="curl\lib\urldata.h" />
+    <ClInclude Include="curl\lib\warnless.h" />
+    <ClInclude Include="curl\lib\wildcard.h" />
+    <ClInclude Include="curl\lib\x509asn1.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\vssh\ssh.h" />
+    <ClInclude Include="curl\lib\vssh\wolfssh.h" />
+    <ClInclude Include="curl\lib\vtls\bearssl.h" />
+    <ClInclude Include="curl\lib\vtls\gskit.h" />
+    <ClInclude Include="curl\lib\vtls\gtls.h" />
+    <ClInclude Include="curl\lib\vtls\mbedtls.h" />
+    <ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h" />
+    <ClInclude Include="curl\lib\vtls\mesalink.h" />
+    <ClInclude Include="curl\lib\vtls\nssg.h" />
+    <ClInclude Include="curl\lib\vtls\openssl.h" />
+    <ClInclude Include="curl\lib\vtls\schannel.h" />
+    <ClInclude Include="curl\lib\vtls\sectransp.h" />
+    <ClInclude Include="curl\lib\vtls\vtls.h" />
+    <ClInclude Include="curl\lib\vtls\wolfssl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="curl\lib\libcurl.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

3rdparty/libcurl.vcxproj.filters

@@ -0,0 +1,911 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="curl\lib\altsvc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\amigaos.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\asyn-ares.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\asyn-thread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\base64.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\conncache.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\connect.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\content_encoding.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cookie.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <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>
+    <ClCompile Include="curl\lib\curl_endian.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_fnmatch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_gethostname.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_get_line.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_gssapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_memrchr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_multibyte.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_ntlm_core.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_ntlm_wb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_path.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_range.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_rtmp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_sasl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_sspi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_threads.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\dict.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <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>
+    <ClCompile Include="curl\lib\escape.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\file.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\fileinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\formdata.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\ftp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\ftplistparser.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\getenv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\getinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\gopher.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hmac.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hostasyn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hostcheck.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hostip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hostip4.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hostip6.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\hostsyn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\http.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\http2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\http_chunks.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\http_digest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\http_negotiate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\http_ntlm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <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>
+    <ClCompile Include="curl\lib\imap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\inet_ntop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\inet_pton.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\krb5.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\ldap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\llist.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\md4.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\md5.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\memdebug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\mime.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\mprintf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\multi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\netrc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\non-ascii.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\nonblock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\nwlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\nwos.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\openldap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\parsedate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\pingpong.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\pop3.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\progress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\psl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\rand.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\rename.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\rtsp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\security.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\select.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\sendf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\setopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\sha256.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\share.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\slist.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\smb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\smtp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\socketpair.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\socks.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\socks_gssapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\socks_sspi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\speedcheck.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\splay.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strcase.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strdup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strtok.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strtoofft.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\system_win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\telnet.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\tftp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\timeval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\transfer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\url.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\urlapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\version.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <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\x509asn1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\cleartext.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\cram.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\digest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\digest_sspi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\krb5_gssapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\krb5_sspi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\ntlm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\ntlm_sspi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\oauth2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\spnego_gssapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vauth\spnego_sspi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <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>
+    <ClCompile Include="curl\lib\vssh\libssh2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vssh\wolfssh.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\bearssl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\gskit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\gtls.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\mbedtls.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\mbedtls_threadlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\mesalink.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\nss.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\openssl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\schannel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\schannel_verify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\sectransp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\vtls.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\wolfssl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="curl\include\curl\curl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\curlver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\easy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\mprintf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\multi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\stdcheaders.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\system.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\typecheck-gcc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\include\curl\urlapi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\altsvc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\amigaos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\arpa_telnet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\asyn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-amigaos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-dos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-mac.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-os400.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-plan9.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-riscos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-symbian.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-tpf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-vxworks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\config-win32ce.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\conncache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\connect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\content_encoding.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cookie.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_addrinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_base64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_ctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_des.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_endian.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_fnmatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_gethostname.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_get_line.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_gssapi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_hmac.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_ldap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_md4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_md5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_memory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_memrchr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_multibyte.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_ntlm_core.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_ntlm_wb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_path.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_printf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_range.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_rtmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_sasl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_sec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_setup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_setup_once.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_sha256.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_sspi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_threads.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\dict.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\doh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\dotdot.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\easyif.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\escape.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\file.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\fileinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\formdata.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\ftp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\ftplistparser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\getinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\gopher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\hostcheck.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\hostip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http_chunks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http_digest.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http_negotiate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http_ntlm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\http_proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\if2ip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\imap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\inet_ntop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\inet_pton.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\llist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\memdebug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\mime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\multihandle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\multiif.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\netrc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\non-ascii.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\nonblock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\parsedate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\pingpong.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\pop3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\progress.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="curl\lib\rename.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\rtsp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\select.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\sendf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\setopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\setup-os400.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\setup-vms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\share.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\sigpipe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\slist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\smb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\smtp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\sockaddr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\socketpair.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\socks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\speedcheck.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\splay.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\strcase.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\strdup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\strerror.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\strtok.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\strtoofft.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\system_win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\telnet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\tftp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\timeval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\transfer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\url.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\urlapi-int.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\urldata.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <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\x509asn1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vauth\digest.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vauth\ntlm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="curl\lib\vssh\wolfssh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\bearssl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\gskit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\gtls.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\mbedtls.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\mesalink.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\nssg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\openssl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\schannel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\sectransp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\vtls.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\wolfssl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="curl\lib\libcurl.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

3rdparty/libusb_cmake/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.4)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_BINARY_DIR}/cmake/modules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 set(LIBUSB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libusb/)
 

3rdparty/llvm.cmake

@@ -12,7 +12,7 @@ if(WITH_LLVM)
 		option(LLVM_INCLUDE_TOOLS OFF)
 		option(LLVM_INCLUDE_UTILS OFF)
 		option(WITH_POLLY OFF)
-		option(LLVM_ENABLE_CXX1Z TRUE)
+		option(LLVM_CCACHE_BUILD ON)
 
 		set(CXX_FLAGS_OLD ${CMAKE_CXX_FLAGS})
 
@@ -27,7 +27,7 @@ if(WITH_LLVM)
 		set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD})
 
 		# now tries to find LLVM again
-		find_package(LLVM 10.0 CONFIG)
+		find_package(LLVM 11.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()
@@ -40,11 +40,11 @@ if(WITH_LLVM)
 			set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
 		endif()
 
-		find_package(LLVM 10.0 CONFIG)
+		find_package(LLVM 11.0 CONFIG)
 
 		if (NOT LLVM_FOUND)
-			if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 9)
-				message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 9.0. \
+			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.")
 			endif()
 

3rdparty/qt5.cmake

@@ -1,16 +1,16 @@
 add_library(3rdparty_qt5 INTERFACE)
 
-find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Network Qml Concurrent)
+find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Concurrent)
 if(WIN32)
 	find_package(Qt5 5.14 COMPONENTS WinExtras REQUIRED)
-	target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Network Qt5::Qml Qt5::Concurrent)
+	target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Concurrent)
 else()
 	find_package(Qt5 5.14 COMPONENTS DBus Gui)
 	if(Qt5DBus_FOUND)
-		target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Qml Qt5::Concurrent)
+		target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Concurrent)
 		target_compile_definitions(3rdparty_qt5 INTERFACE -DHAVE_QTDBUS)
 	else()
-		target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Concurrent)
+		target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::Concurrent)
 	endif()
 	target_include_directories(3rdparty_qt5 INTERFACE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 endif()

3rdparty/wolfssl.vcxproj

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.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">
+    <ProjectGuid>{73973223-5EE8-41CA-8E88-1D60E89A237B}</ProjectGuid>
+    <RootNamespace>wolfssl</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="..\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\common_default_macros.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>./wolfssl;./wolfssl/IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4206;4214;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>./wolfssl;./wolfssl/IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="wolfssl\src\crl.c" />
+    <ClCompile Include="wolfssl\src\internal.c" />
+    <ClCompile Include="wolfssl\src\wolfio.c" />
+    <ClCompile Include="wolfssl\src\keys.c" />
+    <ClCompile Include="wolfssl\src\ocsp.c" />
+    <ClCompile Include="wolfssl\src\ssl.c" />
+    <ClCompile Include="wolfssl\src\tls.c" />
+    <ClCompile Include="wolfssl\src\tls13.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\aes.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\arc4.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\asn.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\blake2b.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\blake2s.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\camellia.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\chacha.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\chacha20_poly1305.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\cmac.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\coding.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\curve25519.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\cpuid.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\des3.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\dh.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\dsa.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\ecc.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\ed25519.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\error.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\fe_operations.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\ge_low_mem.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\ge_operations.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\hash.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\hc128.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\hmac.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\idea.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\integer.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\logging.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\md2.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\md4.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\md5.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\memory.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\pkcs7.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\pkcs12.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\poly1305.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\pwdbased.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\rabbit.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\random.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\ripemd.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\rsa.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sha.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sha256.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sha3.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sha512.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\signature.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sp_c32.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sp_c64.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sp_int.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\sp_x86_64.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\srp.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\tfm.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\wc_encrypt.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\wc_pkcs11.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\wc_port.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\wolfmath.c" />
+    <ClCompile Include="wolfssl\wolfcrypt\src\wolfevent.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="wolfssl\resource.h" />
+    <CustomBuild Include="wolfssl\wolfcrypt\src\aes_asm.asm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">false</ExcludedFromBuild>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ml64.exe /c /Zi /Fo"$(OutDir)%(Filename).obj" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">ml64.exe /c /Zi /Fo"$(IntDir)%(Filename).obj" %(Identity)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)%(Filename).obj</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(IntDir)%(Filename).obj</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</ExcludedFromBuild>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ml64.exe /c /Zi /Fo"$(OutDir)%(Filename).obj" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">ml64.exe /c /Zi /Fo"$(IntDir)%(Filename).obj" %(Identity)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)%(Filename).obj</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(IntDir)%(Filename).obj</Outputs>
+    </CustomBuild>
+    <ClInclude Include="wolfssl\IDE\WIN\user_settings.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="wolfssl\wolfssl.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

3rdparty/yaml-cpp.vcxproj

@@ -37,6 +37,11 @@
     <Import Project="..\rpcs3_release.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <ExceptionHandling>Sync</ExceptionHandling>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="yaml-cpp\src\binary.cpp">
     </ClCompile>

BUILDING.md

@@ -110,9 +110,9 @@ git submodule update --init
 
 Open `rpcs3.sln`. The recommended build configuration is `Release - LLVM` for all purposes.
 
-You may want to download precompiled [LLVM libs](https://github.com/RPCS3/llvm/releases/download/continuous-master/llvmlibs.7z) and extract to root rpcs3 folder (which contains `rpcs3.sln`), as well as download and extract [additional libs](https://drive.google.com/uc?export=download&id=1A2eOMmCO714i0U7J0qI4aEMKnuWl8l_R) 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/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).
 
-If you're not using precompiled libs, build the projects in *__BUILD_BEFORE* folder: right-click on every project > *Build*.
+If you're not using the precompiled libs, build the projects in *__BUILD_BEFORE* folder: right-click on every project > *Build*.
 
 `Build > Build Solution`
 

CMakeLists.txt

@@ -22,7 +22,7 @@ option(USE_LIBEVDEV "libevdev-based joystick support" ON)
 option(USE_DISCORD_RPC "Discord rich presence integration" ON)
 option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON)
 option(USE_VULKAN "Vulkan render backend" ON)
-option(USE_COTIRE "Use precompiled headers" ON)
+option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/rpcs3/cmake_modules")
 

README.md

@@ -2,7 +2,7 @@ RPCS3
 =====
 
 [![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3)
-[![Build status](https://ci.appveyor.com/api/projects/status/411c4clmiohtx7eo/branch/master?svg=true)](https://ci.appveyor.com/project/rpcs3/rpcs3/branch/master)
+[![Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build/latest?definitionId=4&branchName=master)
 
 The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows and Linux.
 
@@ -32,7 +32,7 @@ See [BUILDING.md](BUILDING.md) for more information about how to setup an enviro
 
 Check our friendly [quickstart](https://rpcs3.net/quickstart) guide to make sure your computer meets the minimum system requirements to run RPCS3.
 
-Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2017](https://go.microsoft.com/fwlink/?LinkId=746572) if you are a Windows user.
+Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2019](https://aka.ms/vs/16/release/VC_redist.x64.exe) if you are a Windows user.
 
 ## License
 

Utilities/BEType.h

@@ -18,17 +18,17 @@ union alignas(16) v128
 	template <typename T, std::size_t N, std::size_t M>
 	struct masked_array_t // array type accessed as (index ^ M)
 	{
-		T m_data[N];
+		char m_data[16];
 
 	public:
 		T& operator[](std::size_t index)
 		{
-			return m_data[index ^ M];
+			return reinterpret_cast<T*>(m_data)[index ^ M];
 		}
 
 		const T& operator[](std::size_t index) const
 		{
-			return m_data[index ^ M];
+			return reinterpret_cast<const T*>(m_data)[index ^ M];
 		}
 	};
 
@@ -68,7 +68,7 @@ union alignas(16) v128
 
 	struct bit_array_128
 	{
-		u64 m_data[2];
+		char m_data[16];
 
 	public:
 		class bit_element
@@ -118,26 +118,30 @@ union alignas(16) v128
 		// Index 0 returns the MSB and index 127 returns the LSB
 		bit_element operator[](u32 index)
 		{
+			const auto data_ptr = reinterpret_cast<u64*>(m_data);
+
 			if constexpr (std::endian::little == std::endian::native)
 			{
-				return bit_element(m_data[1 - (index >> 6)], 0x8000000000000000ull >> (index & 0x3F));
+				return bit_element(data_ptr[1 - (index >> 6)], 0x8000000000000000ull >> (index & 0x3F));
 			}
 			else
 			{
-				return bit_element(m_data[index >> 6], 0x8000000000000000ull >> (index & 0x3F));
+				return bit_element(data_ptr[index >> 6], 0x8000000000000000ull >> (index & 0x3F));
 			}
 		}
 
 		// Index 0 returns the MSB and index 127 returns the LSB
 		bool operator[](u32 index) const
 		{
+			const auto data_ptr = reinterpret_cast<const u64*>(m_data);
+
 			if constexpr (std::endian::little == std::endian::native)
 			{
-				return (m_data[1 - (index >> 6)] & (0x8000000000000000ull >> (index & 0x3F))) != 0;
+				return (data_ptr[1 - (index >> 6)] & (0x8000000000000000ull >> (index & 0x3F))) != 0;
 			}
 			else
 			{
-				return (m_data[index >> 6] & (0x8000000000000000ull >> (index & 0x3F))) != 0;
+				return (data_ptr[index >> 6] & (0x8000000000000000ull >> (index & 0x3F))) != 0;
 			}
 		}
 	} _bit;
@@ -219,6 +223,20 @@ union alignas(16) v128
 		return ret;
 	}
 
+	// Unaligned load with optional index offset
+	static v128 loadu(const void* ptr, std::size_t index = 0)
+	{
+		v128 ret;
+		std::memcpy(&ret, static_cast<const u8*>(ptr) + index * sizeof(v128), sizeof(v128));
+		return ret;
+	}
+
+	// Unaligned store with optional index offset
+	static void storeu(v128 value, void* ptr, std::size_t index = 0)
+	{
+		std::memcpy(static_cast<u8*>(ptr) + index * sizeof(v128), &value, sizeof(v128));
+	}
+
 	static inline v128 add8(const v128& left, const v128& right)
 	{
 		return fromV(_mm_add_epi8(left.vi, right.vi));

Utilities/Config.cpp

@@ -1,11 +1,14 @@
 #include "stdafx.h"
 #include "Config.h"
+#include "Utilities/types.h"
 
-#include "yaml-cpp/yaml.h"
+#include "util/yaml.hpp"
 
 #include <typeinfo>
 #include <charconv>
 
+[[noreturn]] void report_fatal_error(const std::string&);
+
 LOG_CHANNEL(cfg_log, "CFG");
 
 namespace cfg
@@ -15,7 +18,7 @@ namespace cfg
 	{
 		if (_type != type::node)
 		{
-			fmt::throw_exception("Invalid root node" HERE);
+			cfg_log.fatal("Invalid root node" HERE);
 		}
 	}
 
@@ -26,7 +29,7 @@ namespace cfg
 		{
 			if (pair.first == name)
 			{
-				fmt::throw_exception("Node already exists: %s" HERE, name);
+				cfg_log.fatal("Node already exists: %s" HERE, name);
 			}
 		}
 
@@ -35,12 +38,12 @@ namespace cfg
 
 	bool _base::from_string(const std::string&, bool)
 	{
-		fmt::throw_exception("from_string() purecall" HERE);
+		report_fatal_error("from_string() purecall" HERE);
 	}
 
 	bool _base::from_list(std::vector<std::string>&&)
 	{
-		fmt::throw_exception("from_list() purecall" HERE);
+		report_fatal_error("from_list() purecall" HERE);
 	}
 
 	// Emit YAML
@@ -80,7 +83,44 @@ bool cfg::try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
 
 	if (result < min || result > max)
 	{
-		if (out) cfg_log.error("cfg::try_to_int('%s'): out of bounds (%lld..%lld)", value, min, max);
+		if (out) cfg_log.error("cfg::try_to_int('%s'): out of bounds (%d..%d)", value, min, max);
+		return false;
+	}
+
+	if (out) *out = result;
+	return true;
+}
+
+std::vector<std::string> cfg::make_uint_range(u64 min, u64 max)
+{
+	return {std::to_string(min), std::to_string(max)};
+}
+
+bool cfg::try_to_uint64(u64* out, const std::string& value, u64 min, u64 max)
+{
+	u64 result;
+	const char* start = &value.front();
+	const char* end = &value.back() + 1;
+	int base = 10;
+
+	if (start[0] == '0' && (start[1] == 'x' || start[1] == 'X'))
+	{
+		// Limited hex support
+		base = 16;
+		start += 2;
+	}
+
+	const auto ret = std::from_chars(start, end, result, base);
+
+	if (ret.ec != std::errc() || ret.ptr != end)
+	{
+		if (out) cfg_log.error("cfg::try_to_int('%s'): invalid integer", value);
+		return false;
+	}
+
+	if (result < min || result > max)
+	{
+		if (out) cfg_log.error("cfg::try_to_int('%s'): out of bounds (%u..%u)", value, min, max);
 		return false;
 	}
 
@@ -286,7 +326,7 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic)
 
 		if (YAML::convert<std::string>::decode(data, value))
 		{
-			rhs.from_string(value);
+			rhs.from_string(value, dynamic);
 		}
 
 		break; // ???
@@ -302,14 +342,17 @@ std::string cfg::node::to_string() const
 	return {out.c_str(), out.size()};
 }
 
-bool cfg::node::from_string(const std::string& value, bool dynamic) try
+bool cfg::node::from_string(const std::string& value, bool dynamic)
 {
-	cfg::decode(YAML::Load(value), *this, dynamic);
-	return true;
-}
-catch (const std::exception& e)
-{
-	cfg_log.fatal("%s thrown: %s", typeid(e).name(), e.what());
+	auto [result, error] = yaml_load(value);
+
+	if (error.empty())
+	{
+		cfg::decode(result, *this, dynamic);
+		return true;
+	}
+
+	cfg_log.fatal("Failed to load node: %s", error);
 	return false;
 }
 
@@ -338,12 +381,7 @@ void cfg::set_entry::from_default()
 
 void cfg::log_entry::set_map(std::map<std::string, logs::level>&& map)
 {
-	logs::reset();
-
-	for (auto&& pair : (m_map = std::move(map)))
-	{
-		logs::set_level(pair.first, pair.second);
-	}
+	m_map = std::move(map);
 }
 
 void cfg::log_entry::from_default()

Utilities/Config.h

@@ -2,7 +2,7 @@
 
 #include "Utilities/types.h"
 #include "Utilities/StrFmt.h"
-#include "Utilities/Log.h"
+#include "util/logs.hpp"
 #include "util/atomic.hpp"
 #include "util/shared_cptr.hpp"
 
@@ -20,6 +20,12 @@ namespace cfg
 	// Convert string to signed integer
 	bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max);
 
+	// Format min and max unsigned values
+	std::vector<std::string> make_uint_range(u64 min, u64 max);
+
+	// Convert string to unsigned integer
+	bool try_to_uint64(u64* out, const std::string& value, u64 min, u64 max);
+
 	// Internal hack
 	bool try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, const std::string&);
 
@@ -27,12 +33,13 @@ namespace cfg
 	std::vector<std::string> try_to_enum_list(decltype(&fmt_class_string<int>::format) func);
 
 	// Config tree entry type.
-	enum class type : uint
+	enum class type : unsigned
 	{
 		node = 0, // cfg::node type
 		_bool, // cfg::_bool type
 		_enum, // cfg::_enum type
 		_int, // cfg::_int type
+		uint, // cfg::uint type
 		string, // cfg::string type
 		set, // cfg::set_entry type
 		log,
@@ -50,7 +57,7 @@ namespace cfg
 		_base(type _type);
 
 		// Owned entry constructor
-		_base(type _type, class node* owner, const std::string& name, bool dynamic = true);
+		_base(type _type, class node* owner, const std::string& name, bool dynamic);
 
 	public:
 		_base(const _base&) = delete;
@@ -126,7 +133,7 @@ namespace cfg
 		atomic_t<bool> m_value;
 
 	public:
-		const bool def;
+		bool def;
 
 		_bool(node* owner, const std::string& name, bool def = false, bool dynamic = false)
 			: _base(type::_bool, owner, name, dynamic)
@@ -302,6 +309,80 @@ namespace cfg
 	// Alias for 64 bit int
 	using int64 = _int<INT64_MIN, INT64_MAX>;
 
+	// Unsigned 32/64-bit integer entry with custom Min/Max range.
+	template <u64 Min, u64 Max>
+	class uint final : public _base
+	{
+		static_assert(Min < Max, "Invalid cfg::uint range");
+
+		// Prefer 32 bit type if possible
+		using int_type = std::conditional_t<Max <= UINT32_MAX, u32, u64>;
+
+		atomic_t<int_type> m_value;
+
+	public:
+		int_type def;
+
+		// Expose range
+		static const u64 max = Max;
+		static const 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)
+			, m_value(def)
+			, def(def)
+		{
+		}
+
+		operator int_type() const
+		{
+			return m_value;
+		}
+
+		int_type get() const
+		{
+			return m_value;
+		}
+
+		void from_default() override
+		{
+			m_value = def;
+		}
+
+		std::string to_string() const override
+		{
+			return std::to_string(m_value);
+		}
+
+		bool from_string(const std::string& value, bool /*dynamic*/ = false) override
+		{
+			u64 result;
+			if (try_to_uint64(&result, value, Min, Max))
+			{
+				m_value = static_cast<int_type>(result);
+				return true;
+			}
+
+			return false;
+		}
+
+		void set(const u64& value)
+		{
+			m_value = static_cast<int_type>(value);
+		}
+
+		std::vector<std::string> to_list() const override
+		{
+			return make_uint_range(Min, Max);
+		}
+	};
+
+	// Alias for 32 bit uint
+	using uint32 = uint<0, UINT32_MAX>;
+
+	// Alias for 64 bit int
+	using uint64 = uint<0, UINT64_MAX>;
+
 	// Simple string entry with mutex
 	class string final : public _base
 	{
@@ -359,15 +440,15 @@ namespace cfg
 		}
 	};
 
-	// Simple set entry with mutex (TODO: template for various types)
+	// Simple set entry (TODO: template for various types)
 	class set_entry final : public _base
 	{
 		std::set<std::string> m_set;
 
 	public:
 		// Default value is empty list in current implementation
-		set_entry(node* owner, const std::string& name, bool dynamic = false)
-			: _base(type::set, owner, name, dynamic)
+		set_entry(node* owner, const std::string& name)
+			: _base(type::set, owner, name, false)
 		{
 		}
 
@@ -402,7 +483,7 @@ namespace cfg
 
 	public:
 		log_entry(node* owner, const std::string& name)
-			: _base(type::log, owner, name)
+			: _base(type::log, owner, name, true)
 		{
 		}
 

Utilities/File.cpp

@@ -129,8 +129,7 @@ static fs::error to_error(DWORD e)
 	case ERROR_DIR_NOT_EMPTY: return fs::error::notempty;
 	case ERROR_NOT_READY: return fs::error::noent;
 	case ERROR_FILENAME_EXCED_RANGE: return fs::error::toolong;
-	//case ERROR_INVALID_PARAMETER: return fs::error::inval;
-	default: fmt::throw_exception("Unknown Win32 error: %u.", e);
+	default: return fs::error::unknown;
 	}
 }
 
@@ -171,7 +170,7 @@ static fs::error to_error(int e)
 	case ENOTEMPTY: return fs::error::notempty;
 	case EROFS: return fs::error::readonly;
 	case EISDIR: return fs::error::isdir;
-	default: fmt::throw_exception("Unknown system error: %d.", e);
+	default: return fs::error::unknown;
 	}
 }
 
@@ -1147,7 +1146,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		return;
 	}
 
-	if (mode & fs::trunc && mode & (fs::lock + fs::unread))
+	if (mode & fs::trunc && mode & (fs::lock + fs::unread) && mode & fs::write)
 	{
 		// Postpone truncation in order to avoid using O_TRUNC on a locked file
 		verify(HERE), ::ftruncate(fd, 0) == 0;
@@ -1314,8 +1313,7 @@ fs::file::file(const void* ptr, std::size_t size)
 			const s64 new_pos =
 				whence == fs::seek_set ? offset :
 				whence == fs::seek_cur ? offset + m_pos :
-				whence == fs::seek_end ? offset + size() :
-				(fmt::raw_error("fs::file::memory_stream::seek(): invalid whence"), 0);
+				whence == fs::seek_end ? offset + size() : -1;
 
 			if (new_pos < 0)
 			{
@@ -1605,15 +1603,14 @@ bool fs::remove_all(const std::string& path, bool remove_root)
 				continue;
 			}
 
-			if (entry.is_directory == false)
+			if (!entry.is_directory)
 			{
 				if (!remove_file(path_append(path, entry.name)))
 				{
 					return false;
 				}
 			}
-
-			if (entry.is_directory == true)
+			else
 			{
 				if (!remove_all(path_append(path, entry.name)))
 				{
@@ -1653,12 +1650,11 @@ u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment)
 			continue;
 		}
 
-		if (entry.is_directory == false)
+		if (!entry.is_directory)
 		{
 			result += ::align(entry.size, rounding_alignment);
 		}
-
-		if (entry.is_directory == true)
+		else
 		{
 			const u64 size = get_dir_size(path_append(path, entry.name), rounding_alignment);
 
@@ -1766,8 +1762,7 @@ fs::file fs::make_gather(std::vector<fs::file> files)
 			const s64 new_pos =
 				whence == fs::seek_set ? offset :
 				whence == fs::seek_cur ? offset + pos :
-				whence == fs::seek_end ? offset + end :
-				(fmt::raw_error("fs::gather_stream::seek(): invalid whence"), 0);
+				whence == fs::seek_end ? offset + end : -1;
 
 			if (new_pos < 0)
 			{
@@ -1823,6 +1818,7 @@ void fmt_class_string<fs::error>::format(std::string& out, u64 arg)
 		case fs::error::readonly: return "Read only";
 		case fs::error::isdir: return "Is a directory";
 		case fs::error::toolong: return "Path too long";
+		case fs::error::unknown: return "Unknown system error";
 		}
 
 		return unknown;

Utilities/File.h

@@ -290,16 +290,16 @@ namespace fs
 		}
 
 		// Write POD unconditionally
-		template<typename T>
-		std::enable_if_t<std::is_pod<T>::value && !std::is_pointer<T>::value, const file&> write(const T& data) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, const file&> write(const T& data) const
 		{
 			if (write(std::addressof(data), sizeof(T)) != sizeof(T)) xfail();
 			return *this;
 		}
 
 		// Write POD std::vector unconditionally
-		template<typename T>
-		std::enable_if_t<std::is_pod<T>::value && !std::is_pointer<T>::value, const file&> write(const std::vector<T>& vec) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, const file&> write(const std::vector<T>& vec) const
 		{
 			if (write(vec.data(), vec.size() * sizeof(T)) != vec.size() * sizeof(T)) xfail();
 			return *this;
@@ -319,30 +319,30 @@ namespace fs
 		}
 
 		// Read POD, sizeof(T) is used
-		template<typename T>
-		std::enable_if_t<std::is_pod<T>::value && !std::is_pointer<T>::value, bool> read(T& data) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, bool> read(T& data) const
 		{
 			return read(&data, sizeof(T)) == sizeof(T);
 		}
 
 		// Read POD std::vector, size must be set by resize() method
-		template<typename T>
-		std::enable_if_t<std::is_pod<T>::value && !std::is_pointer<T>::value, bool> read(std::vector<T>& vec) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, bool> read(std::vector<T>& vec) const
 		{
 			return read(vec.data(), sizeof(T) * vec.size()) == sizeof(T) * vec.size();
 		}
 
 		// Read POD std::vector
-		template<typename T>
-		std::enable_if_t<std::is_pod<T>::value && !std::is_pointer<T>::value, bool> read(std::vector<T>& vec, std::size_t size) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, bool> read(std::vector<T>& vec, std::size_t size) const
 		{
 			vec.resize(size);
 			return read(vec.data(), sizeof(T) * size) == sizeof(T) * size;
 		}
 
 		// Read POD (experimental)
-		template<typename T>
-		std::enable_if_t<std::is_pod<T>::value && !std::is_pointer<T>::value, T> read() const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, T> read() const
 		{
 			T result;
 			if (!read(result)) xfail();
@@ -360,7 +360,7 @@ namespace fs
 
 		// Read full file to std::vector
 		template<typename T>
-		std::enable_if_t<std::is_pod<T>::value && !std::is_pointer<T>::value, std::vector<T>> to_vector() const
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, std::vector<T>> to_vector() const
 		{
 			std::vector<T> result;
 			result.resize(size() / sizeof(T));
@@ -516,6 +516,7 @@ namespace fs
 		readonly,
 		isdir,
 		toolong,
+		unknown
 	};
 
 	// Error code returned
@@ -597,8 +598,7 @@ namespace fs
 			const s64 new_pos =
 				whence == fs::seek_set ? offset :
 				whence == fs::seek_cur ? offset + pos :
-				whence == fs::seek_end ? offset + size() :
-				(fmt::raw_error("fs::container_stream<>::seek(): invalid whence"), 0);
+				whence == fs::seek_end ? offset + size() : -1;
 
 			if (new_pos < 0)
 			{

Utilities/JIT.cpp

@@ -2,7 +2,7 @@
 #include "JIT.h"
 #include "StrFmt.h"
 #include "File.h"
-#include "Log.h"
+#include "util/logs.hpp"
 #include "mutex.h"
 #include "sysinfo.h"
 #include "VirtualMemory.h"
@@ -918,12 +918,12 @@ public:
 	void notifyObjectCompiled(const llvm::Module* module, llvm::MemoryBufferRef obj) override
 	{
 		std::string name = m_path;
-		name.append(module->getName());
+		name.append(module->getName().data());
 		//fs::file(name, fs::rewrite).write(obj.getBufferStart(), obj.getBufferSize());
 		name.append(".gz");
 
 		z_stream zs{};
-		uLong zsz = compressBound(obj.getBufferSize()) + 256;
+		uLong zsz = compressBound(::narrow<u32>(obj.getBufferSize(), HERE)) + 256;
 		auto zbuf = std::make_unique<uchar[]>(zsz);
 #ifndef _MSC_VER
 #pragma GCC diagnostic push
@@ -965,6 +965,11 @@ public:
 			std::vector<uchar> gz = cached.to_vector<uchar>();
 			std::vector<uchar> out;
 			z_stream zs{};
+
+			if (gz.empty()) [[unlikely]]
+			{
+				return nullptr;
+			}
 #ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
@@ -1015,6 +1020,11 @@ public:
 
 		if (fs::file cached{path, fs::read})
 		{
+			if (cached.size() == 0) [[unlikely]]
+			{
+				return nullptr;
+			}
+
 			auto buf = llvm::WritableMemoryBuffer::getNewUninitMemBuffer(cached.size());
 			cached.read(buf->getBufferStart(), buf->getBufferSize());
 			return buf;
@@ -1026,7 +1036,7 @@ public:
 	std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* module) override
 	{
 		std::string path = m_path;
-		path.append(module->getName());
+		path.append(module->getName().data());
 
 		if (auto buf = load(path))
 		{
@@ -1044,7 +1054,7 @@ std::string jit_compiler::cpu(const std::string& _cpu)
 
 	if (m_cpu.empty())
 	{
-		m_cpu = llvm::sys::getHostCPUName();
+		m_cpu = llvm::sys::getHostCPUName().operator std::string();
 
 		if (m_cpu == "sandybridge" ||
 			m_cpu == "ivybridge" ||
@@ -1077,7 +1087,7 @@ std::string jit_compiler::cpu(const std::string& _cpu)
 			m_cpu == "tigerlake")
 		{
 			// Downgrade if AVX-512 is disabled or not supported
-			if (!utils::has_512())
+			if (!utils::has_avx512())
 			{
 				m_cpu = "skylake";
 			}
@@ -1200,6 +1210,24 @@ void jit_compiler::add(const std::string& path)
 	}
 }
 
+bool jit_compiler::check(const std::string& path)
+{
+	if (auto cache = ObjectCache::load(path))
+	{
+		if (auto object_file = llvm::object::ObjectFile::createObjectFile(*cache))
+		{
+			return true;
+		}
+
+		if (fs::remove_file(path))
+		{
+			jit_log.error("ObjectCache: Removed damaged file: %s", path);
+		}
+	}
+
+	return false;
+}
+
 void jit_compiler::fin()
 {
 	m_engine->finalizeObject();

Utilities/JIT.h

@@ -171,6 +171,9 @@ public:
 	// Add object (path to obj file)
 	void add(const std::string& path);
 
+	// Check object file
+	static bool check(const std::string& path);
+
 	// Finalize
 	void fin();
 

Utilities/StrFmt.cpp

@@ -1,10 +1,12 @@
-#include "StrFmt.h"
+#include "StrFmt.h"
 #include "BEType.h"
 #include "StrUtil.h"
 #include "cfmt.h"
+#include "util/logs.hpp"
 
 #include <algorithm>
 #include <string_view>
+#include "Thread.h"
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -12,6 +14,47 @@
 #include <errno.h>
 #endif
 
+#ifdef _WIN32
+std::string wchar_to_utf8(wchar_t *src)
+{
+	std::string utf8_string;
+	const auto tmp_size = WideCharToMultiByte(CP_UTF8, 0, src, -1, nullptr, 0, nullptr, nullptr);
+	utf8_string.resize(tmp_size);
+	WideCharToMultiByte(CP_UTF8, 0, src, -1, utf8_string.data(), tmp_size, nullptr, nullptr);
+	return utf8_string;
+}
+
+std::string wchar_path_to_ansi_path(const std::wstring& src)
+{
+	std::wstring buf_short;
+	std::string buf_final;
+
+	// Get the short path from the wide char path(short path should only contain ansi characters)
+	auto tmp_size = GetShortPathNameW(src.data(), nullptr, 0);
+	buf_short.resize(tmp_size);
+	GetShortPathNameW(src.data(), buf_short.data(), tmp_size);
+
+	// Convert wide char to ansi
+	tmp_size = WideCharToMultiByte(CP_ACP, 0, buf_short.data(), -1, nullptr, 0, nullptr, nullptr);
+	buf_final.resize(tmp_size);
+	WideCharToMultiByte(CP_ACP, 0, buf_short.data(), -1, buf_final.data(), tmp_size, nullptr, nullptr);
+
+	return buf_final;
+}
+
+std::string utf8_path_to_ansi_path(const std::string& src)
+{
+	std::wstring buf_wide;
+
+	// Converts the utf-8 path to wide char
+	const auto tmp_size = MultiByteToWideChar(CP_UTF8, 0, src.c_str(), -1, nullptr, 0);
+	buf_wide.resize(tmp_size);
+	MultiByteToWideChar(CP_UTF8, 0, src.c_str(), -1, buf_wide.data(), tmp_size);
+
+	return wchar_path_to_ansi_path(buf_wide);
+}
+#endif
+
 template <>
 void fmt_class_string<std::pair<const fmt_type_info*, u64>>::format(std::string& out, u64 arg)
 {
@@ -203,7 +246,7 @@ namespace fmt
 {
 	void raw_error(const char* msg)
 	{
-		throw std::runtime_error{msg};
+		thread_ctrl::emergency_exit(msg);
 	}
 
 	void raw_verify_error(const char* msg, const fmt_type_info* sup, u64 arg)
@@ -236,7 +279,7 @@ namespace fmt
 			out += msg;
 		}
 
-		throw std::runtime_error{out};
+		thread_ctrl::emergency_exit(out);
 	}
 
 	void raw_narrow_error(const char* msg, const fmt_type_info* sup, u64 arg)
@@ -256,14 +299,14 @@ namespace fmt
 			out += msg;
 		}
 
-		throw std::range_error{out};
+		thread_ctrl::emergency_exit(out);
 	}
 
 	void raw_throw_exception(const char* fmt, const fmt_type_info* sup, const u64* args)
 	{
 		std::string out;
 		raw_append(out, fmt, sup, args);
-		throw std::runtime_error{out};
+		thread_ctrl::emergency_exit(out);
 	}
 
 	struct cfmt_src;
@@ -342,7 +385,7 @@ std::string fmt::replace_first(const std::string& src, const std::string& from,
 {
 	auto pos = src.find(from);
 
-	if (pos == std::string::npos)
+	if (pos == umax)
 	{
 		return src;
 	}
@@ -353,7 +396,7 @@ std::string fmt::replace_first(const std::string& src, const std::string& from,
 std::string fmt::replace_all(const std::string& src, const std::string& from, const std::string& to)
 {
 	std::string target = src;
-	for (auto pos = target.find(from); pos != std::string::npos; pos = target.find(from, pos + 1))
+	for (auto pos = target.find(from); pos != umax; pos = target.find(from, pos + 1))
 	{
 		target = (pos ? target.substr(0, pos) + to : to) + std::string(target.c_str() + pos + from.length());
 		pos += to.length();

Utilities/StrUtil.h

@@ -7,22 +7,19 @@
 #include <functional>
 #include <string_view>
 
-// Copy null-terminated string from std::string to char array with truncation
-template <std::size_t N>
-inline void strcpy_trunc(char (&dst)[N], const std::string& src)
-{
-	const std::size_t count = src.size() >= N ? N - 1 : src.size();
-	std::memcpy(dst, src.c_str(), count);
-	std::memset(dst + count, 0, N - count);
-}
+#ifdef _WIN32
+std::string wchar_to_utf8(wchar_t *src);
+std::string wchar_path_to_ansi_path(const std::wstring& src);
+std::string utf8_path_to_ansi_path(const std::string& src);
+#endif
 
-// Copy null-terminated string from char array to another char array with truncation
-template <std::size_t N, std::size_t N2>
-inline void strcpy_trunc(char (&dst)[N], const char (&src)[N2])
+// 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)
 {
-	const std::size_t count = N2 >= N ? N - 1 : N2;
-	std::memcpy(dst, src, count);
-	std::memset(dst + count, 0, N - count);
+	const std::size_t count = std::size(src) >= std::size(dst) ? std::size(dst) - 1 : std::size(src);
+	std::memcpy(std::data(dst), std::data(src), count);
+	std::memset(std::data(dst) + count, 0, std::size(dst) - count);
 }
 
 namespace fmt
@@ -84,7 +81,7 @@ namespace fmt
 	template <typename T>
 	std::string merge(const T& source, const std::string& separator)
 	{
-		if (!source.size())
+		if (source.empty())
 		{
 			return {};
 		}

Utilities/Thread.cpp

@@ -40,10 +40,41 @@
 #include <sys/timerfd.h>
 #endif
 
-#include "sync.h"
-#include "Log.h"
+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# include <sys/sysctl.h>
+# include <unistd.h>
+# if defined(__DragonFly__) || defined(__FreeBSD__)
+#  include <sys/user.h>
+# endif
+# if defined(__OpenBSD__)
+#  include <sys/param.h>
+#  include <sys/proc.h>
+# endif
 
-LOG_CHANNEL(sig_log);
+# if defined(__NetBSD__)
+#  undef KERN_PROC
+#  define KERN_PROC KERN_PROC2
+#  define kinfo_proc kinfo_proc2
+# endif
+
+# if defined(__APPLE__)
+#  define KP_FLAGS kp_proc.p_flag
+# elif defined(__DragonFly__)
+#  define KP_FLAGS kp_flags
+# elif defined(__FreeBSD__)
+#  define KP_FLAGS ki_flag
+# elif defined(__NetBSD__)
+#  define KP_FLAGS p_flag
+# elif defined(__OpenBSD__)
+#  define KP_FLAGS p_psflags
+#  define P_TRACED PS_TRACED
+# endif
+#endif
+
+#include "sync.h"
+#include "util/logs.hpp"
+
+LOG_CHANNEL(sig_log, "SIG");
 LOG_CHANNEL(sys_log, "SYS");
 LOG_CHANNEL(vm_log, "VM");
 
@@ -60,21 +91,68 @@ void fmt_class_string<std::thread::id>::format(std::string& out, u64 arg)
 	out += ss.str();
 }
 
-[[noreturn]] void catch_all_exceptions()
+#ifndef _WIN32
+bool IsDebuggerPresent()
 {
-	try
+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+	int mib[] = {
+		CTL_KERN,
+		KERN_PROC,
+		KERN_PROC_PID,
+		getpid(),
+# if defined(__NetBSD__) || defined(__OpenBSD__)
+		sizeof(struct kinfo_proc),
+		1,
+# endif
+	};
+	u_int miblen = std::size(mib);
+	struct kinfo_proc info;
+	size_t size = sizeof(info);
+
+	if (sysctl(mib, miblen, &info, &size, NULL, 0))
 	{
-		throw;
+		return false;
 	}
-	catch (const std::exception& e)
+
+	return info.KP_FLAGS & P_TRACED;
+#else
+	char buf[4096];
+	fs::file status_fd("/proc/self/status");
+	if (!status_fd)
 	{
-		report_fatal_error("{" + g_tls_log_prefix() + "} Unhandled exception of type '"s + typeid(e).name() + "': "s + e.what());
+		std::fprintf(stderr, "Failed to open /proc/self/status\n");
+		return false;
 	}
-	catch (...)
+
+	const auto num_read = status_fd.read(buf, sizeof(buf) - 1);
+	if (num_read == 0 || num_read == umax)
 	{
-		report_fatal_error("{" + g_tls_log_prefix() + "} Unhandled exception (unknown)");
+		std::fprintf(stderr, "Failed to read /proc/self/status (%d)\n", errno);
+		return false;
 	}
+
+	buf[num_read] = '\0';
+	std::string_view status = buf;
+
+	const auto found = status.find("TracerPid:");
+	if (found == umax)
+	{
+		std::fprintf(stderr, "Failed to find 'TracerPid:' in /proc/self/status\n");
+		return false;
+	}
+
+	for (const char* cp = status.data() + found + 10; cp <= status.data() + num_read; ++cp)
+	{
+		if (!std::isspace(*cp))
+		{
+			return std::isdigit(*cp) != 0 && *cp != '0';
+		}
+	}
+
+	return false;
+#endif
 }
+#endif
 
 enum x64_reg_t : u32
 {
@@ -1111,33 +1189,12 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 
 	if (rsx::g_access_violation_handler)
 	{
-		bool handled = false;
-
-		try
+		if (cpu)
 		{
-			if (cpu)
-			{
-				vm::temporary_unlock(*cpu);
-			}
-
-			handled = rsx::g_access_violation_handler(addr, is_writing);
+			vm::temporary_unlock(*cpu);
 		}
-		catch (const std::exception& e)
-		{
-			rsx_log.fatal("g_access_violation_handler(0x%x, %d): %s", addr, is_writing, e.what());
 
-			if (cpu)
-			{
-				cpu->state += cpu_flag::dbg_pause;
-
-				if (cpu->test_stopped())
-				{
-					std::terminate();
-				}
-			}
-
-			return false;
-		}
+		bool handled = rsx::g_access_violation_handler(addr, is_writing);
 
 		if (handled)
 		{
@@ -1393,9 +1450,17 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 				pf_events->events.emplace(static_cast<u32>(data2), addr);
 			}
 
-			sig_log.error("Page_fault %s location 0x%x because of %s memory", is_writing ? "writing" : "reading",
+			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");
 
+			if (cpu->id_type() == 1)
+			{
+				if (const auto func = static_cast<ppu_thread*>(cpu)->current_function)
+				{
+					sig_log.warning("Page_fault while in function %s", func);
+				}
+			}
+
 			error_code sending_error = sys_event_port_send(pf_port_id, data1, data2, data3);
 
 			// If we fail due to being busy, wait a bit and try again.
@@ -1448,8 +1513,8 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 		{
 			if (!access_violation_recovered)
 			{
-				vm_log.notice("\n%s", cpu->dump());
-				vm_log.fatal("Access violation %s location 0x%x (%s)", is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory");
+				vm_log.notice("\n%s", cpu->dump_all());
+				vm_log.error("Access violation %s location 0x%x (%s)", is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory");
 			}
 
 			// TODO:
@@ -1479,7 +1544,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 
 	if (cpu && !access_violation_recovered)
 	{
-		vm_log.notice("\n%s", cpu->dump());
+		vm_log.notice("\n%s", cpu->dump_all());
 	}
 
 	// Note: a thread may access violate more than once after hack_alloc recovery
@@ -1560,7 +1625,7 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
 
 		if (const auto cpu = get_current_cpu_thread())
 		{
-			sys_log.notice("\n%s", cpu->dump());
+			sys_log.notice("\n%s", cpu->dump_all());
 		}
 	}
 
@@ -1568,9 +1633,6 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
 
 	fmt::append(msg, "Thread id = %s.\n", std::this_thread::get_id());
 
-	sys_log.notice("Memory bases:\nvm::g_base_addr = %p\nvm::g_sudo_addr = %p\nvm::g_exec_addr = %p\nvm::g_stat_addr = %p\nvm::g_reservations = %p\n",
-	vm::g_base_addr, vm::g_sudo_addr, vm::g_exec_addr, vm::g_stat_addr, vm::g_reservations);
-
 	std::vector<HMODULE> modules;
 	for (DWORD size = 256; modules.size() != size; size /= sizeof(HMODULE))
 	{
@@ -1692,12 +1754,9 @@ static void signal_handler(int sig, siginfo_t* info, void* uct) noexcept
 
 	if (const auto cpu = get_current_cpu_thread())
 	{
-		sys_log.notice("\n%s", cpu->dump());
+		sys_log.notice("\n%s", cpu->dump_all());
 	}
 
-	sys_log.notice("Memory bases:\nvm::g_base_addr = %p\nvm::g_sudo_addr = %p\nvm::g_exec_addr = %p\nvm::g_stat_addr = %p\nvm::g_reservations = %p\n",
-	vm::g_base_addr, vm::g_sudo_addr, vm::g_exec_addr, vm::g_stat_addr, vm::g_reservations);
-
 	std::string msg = fmt::format("Segfault %s location %p at %p.\n", cause, info->si_addr, RIP(context));
 
 	if (thread_ctrl::get_current())
@@ -1709,8 +1768,14 @@ static void signal_handler(int sig, siginfo_t* info, void* uct) noexcept
 
 	fmt::append(msg, "Thread id = %s.\n", std::this_thread::get_id());
 
-	// TODO (debugger interaction)
 	sys_log.fatal("\n%s", msg);
+	std::fprintf(stderr, "%s\n", msg.c_str());
+
+	if (IsDebuggerPresent())
+	{
+		__asm("int3;");
+	}
+
 	report_fatal_error(msg);
 }
 
@@ -1723,17 +1788,37 @@ const bool s_exception_handler_set = []() -> bool
 
 	if (::sigaction(SIGSEGV, &sa, NULL) == -1)
 	{
-		std::printf("sigaction(SIGSEGV) failed (0x%x).", errno);
+		std::fprintf(stderr, "sigaction(SIGSEGV) failed (%d).\n", errno);
 		std::abort();
 	}
 
+	std::printf("Debugger: %d\n", +IsDebuggerPresent());
 	return true;
 }();
 
 #endif
 
+const bool s_terminate_handler_set = []() -> bool
+{
+	std::set_terminate([]()
+	{
+		if (IsDebuggerPresent())
+#ifdef _MSC_VER
+			__debugbreak();
+#else
+			__asm("int3;");
+#endif
+
+		report_fatal_error("RPCS3 has abnormally terminated.");
+	});
+
+	return true;
+}();
+
 thread_local DECLARE(thread_ctrl::g_tls_this_thread) = nullptr;
 
+thread_local DECLARE(thread_ctrl::g_tls_error_callback) = nullptr;
+
 DECLARE(thread_ctrl::g_native_core_layout) { native_core_arrangement::undefined };
 
 void thread_base::start(native_entry entry)
@@ -1746,11 +1831,13 @@ void thread_base::start(native_entry entry)
 #endif
 }
 
-void thread_base::initialize(bool(*wait_cb)(const void*))
+void thread_base::initialize(void (*error_cb)(), bool(*wait_cb)(const void*))
 {
-	// Initialize TLS variable
+	// Initialize TLS variables
 	thread_ctrl::g_tls_this_thread = this;
 
+	thread_ctrl::g_tls_error_callback = error_cb;
+
 	// Initialize atomic wait callback
 	atomic_storage_futex::set_wait_callback(wait_cb);
 
@@ -1800,36 +1887,18 @@ void thread_base::initialize(bool(*wait_cb)(const void*))
 	name.resize(std::min<std::size_t>(15, name.size()));
 	pthread_setname_np(pthread_self(), name.c_str());
 #endif
-
-#ifdef __linux__
-	m_timer = timerfd_create(CLOCK_MONOTONIC, 0);
-	if (m_timer == -1)
-	{
-		sig_log.error("Linux timer allocation failed, use wait_unlock() only");
-	}
-#endif
 }
 
 void thread_base::notify_abort() noexcept
 {
-	// For now
-	notify();
-
 	atomic_storage_futex::raw_notify(+m_state_notifier);
 }
 
-bool thread_base::finalize(int) noexcept
+bool thread_base::finalize(thread_state result_state) noexcept
 {
 	// Report pending errors
 	error_code::error_report(0, 0, 0, 0);
 
-#ifdef __linux__
-	if (m_timer != -1)
-	{
-		close(m_timer);
-	}
-#endif
-
 #ifdef _WIN32
 	ULONG64 cycles{};
 	QueryThreadCycleTime(GetCurrentThread(), &cycles);
@@ -1872,7 +1941,7 @@ bool thread_base::finalize(int) noexcept
 		fsoft, fhard, ctxvol, ctxinv);
 
 	// Return true if need to delete thread object
-	const bool ok = m_state.exchange(thread_state::finished) <= thread_state::aborting;
+	const bool ok = m_state.exchange(result_state) <= thread_state::aborting;
 
 	// Signal waiting threads
 	m_state.notify_all();
@@ -1883,6 +1952,7 @@ bool thread_base::finalize(int) noexcept
 
 void thread_base::finalize() noexcept
 {
+	atomic_storage_futex::set_wait_callback([](const void*){ return true; });
 	g_tls_log_prefix = []() -> std::string { return {}; };
 	thread_ctrl::g_tls_this_thread = nullptr;
 }
@@ -1892,7 +1962,34 @@ void thread_ctrl::_wait_for(u64 usec, bool alert /* true */)
 	auto _this = g_tls_this_thread;
 
 #ifdef __linux__
-	if (!alert && _this->m_timer != -1 && usec > 0 && usec <= 1000)
+	static thread_local struct linux_timer_handle_t
+	{
+		// Allocate timer only if needed (i.e. someone calls _wait_for with alert and short period)
+		const int m_timer = timerfd_create(CLOCK_MONOTONIC, 0);
+
+		linux_timer_handle_t() noexcept
+		{
+			if (m_timer == -1)
+			{
+				sig_log.error("Linux timer allocation failed, using the fallback instead.");
+			}
+		}
+
+		operator int() const
+		{
+			return m_timer;
+		}
+
+		~linux_timer_handle_t()
+		{
+			if (m_timer != -1)
+			{
+				close(m_timer);
+			}
+		}
+	} fd_timer;
+
+	if (!alert && usec > 0 && usec <= 1000 && fd_timer != -1)
 	{
 		struct itimerspec timeout;
 		u64 missed;
@@ -1902,55 +1999,19 @@ void thread_ctrl::_wait_for(u64 usec, bool alert /* true */)
 		timeout.it_value.tv_sec = nsec / 1000000000ull;
 		timeout.it_interval.tv_sec = 0;
 		timeout.it_interval.tv_nsec = 0;
-		timerfd_settime(_this->m_timer, 0, &timeout, NULL);
-		if (read(_this->m_timer, &missed, sizeof(missed)) != sizeof(missed))
+		timerfd_settime(fd_timer, 0, &timeout, NULL);
+		if (read(fd_timer, &missed, sizeof(missed)) != sizeof(missed))
 			sig_log.error("timerfd: read() failed");
 		return;
 	}
 #endif
 
-	std::unique_lock lock(_this->m_mutex, std::defer_lock);
-
-	while (true)
+	if (_this->m_signal && _this->m_signal.exchange(0))
 	{
-		// Mutex is unlocked at the start and after the waiting
-		if (u32 sig = _this->m_signal.load())
-		{
-			if (sig & 1)
-			{
-				_this->m_signal &= ~1;
-				return;
-			}
-		}
-
-		if (usec == 0)
-		{
-			// No timeout: return immediately
-			return;
-		}
-
-		if (!lock)
-		{
-			lock.lock();
-		}
-
-		// Double-check the value
-		if (u32 sig = _this->m_signal.load())
-		{
-			if (sig & 1)
-			{
-				_this->m_signal &= ~1;
-				return;
-			}
-		}
-
-		_this->m_cond.wait_unlock(usec, lock);
-
-		if (usec < cond_variable::max_timeout)
-		{
-			usec = 0;
-		}
+		return;
 	}
+
+	_this->m_signal.wait(0, atomic_wait_timeout{usec <= 0xffff'ffff'ffff'ffff / 1000 ? usec * 1000 : 0xffff'ffff'ffff'ffff});
 }
 
 std::string thread_ctrl::get_name_cached()
@@ -1989,22 +2050,24 @@ thread_base::~thread_base()
 	}
 }
 
-void thread_base::join() const
+bool thread_base::join() const
 {
-	for (auto state = m_state.load(); state != thread_state::finished;)
+	for (auto state = m_state.load(); state != thread_state::finished && state != thread_state::errored;)
 	{
 		m_state.wait(state);
 		state = m_state;
 	}
+
+	return m_state.load() == thread_state::finished;
 }
 
 void thread_base::notify()
 {
-	if (!(m_signal & 1))
+	// Increment with saturation
+	if (m_signal.try_inc())
 	{
-		m_signal |= 1;
-		m_mutex.lock_unlock();
-		m_cond.notify_one();
+		// Considered impossible to have a situation when not notified
+		m_signal.notify_all();
 	}
 }
 
@@ -2045,17 +2108,58 @@ u64 thread_base::get_cycles()
 	}
 }
 
+void thread_ctrl::emergency_exit(std::string_view reason)
+{
+	sig_log.fatal("Thread terminated due to fatal error: %s", reason);
+
+	std::fprintf(stderr, "Thread '%s' terminated due to fatal error: %s\n", g_tls_log_prefix().c_str(), std::string(reason).c_str());
+
+#ifdef _WIN32
+	if (IsDebuggerPresent())
+	{
+		OutputDebugStringA(fmt::format("Thread '%s' terminated due to fatal error: %s\n", g_tls_log_prefix(), reason).c_str());
+		__debugbreak();
+	}
+#else
+	if (IsDebuggerPresent())
+	{
+		__asm("int3;");
+	}
+#endif
+
+	if (const auto _this = g_tls_this_thread)
+	{
+		g_tls_error_callback();
+
+		if (_this->finalize(thread_state::errored))
+		{
+			delete _this;
+		}
+
+		thread_base::finalize();
+
+#ifdef _WIN32
+		_endthreadex(0);
+#else
+		pthread_exit(0);
+#endif
+	}
+
+	// Assume main thread
+	report_fatal_error(std::string(reason));
+}
+
 void thread_ctrl::detect_cpu_layout()
 {
 	if (!g_native_core_layout.compare_and_swap_test(native_core_arrangement::undefined, native_core_arrangement::generic))
 		return;
 
 	const auto system_id = utils::get_system_info();
-	if (system_id.find("Ryzen") != std::string::npos)
+	if (system_id.find("Ryzen") != umax)
 	{
 		g_native_core_layout.store(native_core_arrangement::amd_ccx);
 	}
-	else if (system_id.find("Intel") != std::string::npos)
+	else if (system_id.find("Intel") != umax)
 	{
 #ifdef _WIN32
 		const LOGICAL_PROCESSOR_RELATIONSHIP relationship = LOGICAL_PROCESSOR_RELATIONSHIP::RelationProcessorCore;
@@ -2125,7 +2229,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 			const auto system_id = utils::get_system_info();
 			if (thread_count >= 32)
 			{
-				if (system_id.find("3950X") != std::string::npos)
+				if (system_id.find("3950X") != umax)
 				{
 					// zen2
 					// Ryzen 9 3950X
@@ -2134,7 +2238,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 					spu_mask = 0b00000000111111110000000000000000;
 					rsx_mask = 0b00000000000000001111111100000000;
 				}
-				else if (system_id.find("2970WX") != std::string::npos)
+				else if (system_id.find("2970WX") != umax)
 				{
 					// zen+
 					// Threadripper 2970WX
@@ -2156,7 +2260,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 			}
 			else if (thread_count == 24)
 			{
-				if (system_id.find("3900X") != std::string::npos)
+				if (system_id.find("3900X") != umax)
 				{
 					// zen2
 					// Ryzen 9 3900X
@@ -2177,7 +2281,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 			}
 			else if (thread_count == 16)
 			{
-				if (system_id.find("3700X") != std::string::npos || system_id.find("3800X") != std::string::npos)
+				if (system_id.find("3700X") != umax || system_id.find("3800X") != umax)
 				{
 					// Ryzen 7 3700/3800 (x)
 					// Assign threads 1-16
@@ -2197,7 +2301,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 			}
 			else if (thread_count == 12)
 			{
-				if (system_id.find("3600") != std::string::npos)
+				if (system_id.find("3600") != umax)
 				{
 					// zen2
 					// R5 3600 (x)
@@ -2302,7 +2406,7 @@ void thread_ctrl::set_thread_affinity_mask(u64 mask)
 	SetThreadAffinityMask(_this_thread, mask);
 #elif __APPLE__
 	// Supports only one core
-	thread_affinity_policy_data_t policy = { static_cast<integer_t>(utils::cnttz64(mask)) };
+	thread_affinity_policy_data_t policy = { static_cast<integer_t>(std::countr_zero(mask)) };
 	thread_port_t mach_thread = pthread_mach_thread_np(pthread_self());
 	thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, reinterpret_cast<thread_policy_t>(&policy), 1);
 #elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
@@ -2327,6 +2431,66 @@ void thread_ctrl::set_thread_affinity_mask(u64 mask)
 		}
 	}
 
-	pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs);
+	if (int err = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs))
+	{
+		sig_log.error("Failed to set thread affinity 0x%x: error %d.", mask, err);
+	}
+#endif
+}
+
+u64 thread_ctrl::get_thread_affinity_mask()
+{
+#ifdef _WIN32
+	DWORD_PTR res, _sys;
+	if (!GetProcessAffinityMask(GetCurrentProcess(), &res, &_sys))
+	{
+		sig_log.error("Failed to get process affinity mask.");
+		return 0;
+	}
+
+	if (DWORD_PTR result = SetThreadAffinityMask(GetCurrentThread(), res))
+	{
+		if (res != result)
+		{
+			SetThreadAffinityMask(GetCurrentThread(), result);
+		}
+
+		return result;
+	}
+
+	sig_log.error("Failed to get thread affinity mask.");
+	return 0;
+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
+	cpu_set_t cs;
+	CPU_ZERO(&cs);
+
+	if (int err = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs))
+	{
+		sig_log.error("Failed to get thread affinity mask: error %d.", err);
+		return 0;
+	}
+
+	u64 result;
+
+	for (u32 core = 0; core < 64u; core++)
+	{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+		if (CPU_ISSET(core, &cs))
+#pragma GCC diagnostic pop
+		{
+			result |= 1ull << core;
+		}
+	}
+
+	if (result == 0)
+	{
+		sig_log.error("Thread affinity mask is out of u64 range.");
+		return 0;
+	}
+
+	return result;
+#else
+	return -1;
 #endif
 }

Utilities/Thread.h

@@ -15,9 +15,6 @@
 // Report error and call std::abort(), defined in main.cpp
 [[noreturn]] void report_fatal_error(const std::string&);
 
-// Will report exception and call std::abort() if put in catch(...)
-[[noreturn]] void catch_all_exceptions();
-
 // Hardware core layout
 enum class native_core_arrangement : u32
 {
@@ -39,6 +36,7 @@ enum class thread_state : u32
 {
 	created,  // Initial state
 	aborting, // The thread has been joined in the destructor or explicitly aborted
+	errored, // Set after the emergency_exit call
 	finished  // Final state, always set at the end of thread execution
 };
 
@@ -48,6 +46,8 @@ class named_thread;
 template <typename T>
 struct result_storage
 {
+	static_assert(std::is_default_constructible_v<T> && noexcept(T()));
+
 	alignas(T) std::byte data[sizeof(T)];
 
 	static constexpr bool empty = false;
@@ -97,21 +97,10 @@ class thread_base
 	using native_entry = void*(*)(void* arg);
 #endif
 
-#ifdef __linux__
-	// Linux thread timer
-	int m_timer = -1;
-#endif
-
 	// Thread handle (platform-specific)
 	atomic_t<std::uintptr_t> m_thread{0};
 
-	// Thread mutex
-	mutable shared_mutex m_mutex;
-
-	// Thread condition variable
-	cond_variable m_cond;
-
-	// Thread flags
+	// Thread playtoy, that shouldn't be used
 	atomic_t<u32> m_signal{0};
 
 	// Thread state
@@ -130,13 +119,13 @@ class thread_base
 	void start(native_entry);
 
 	// Called at the thread start
-	void initialize(bool(*wait_cb)(const void*));
+	void initialize(void (*error_cb)(), bool(*wait_cb)(const void*));
 
 	// May be called in destructor
 	void notify_abort() noexcept;
 
 	// Called at the thread end, returns true if needs destruction
-	bool finalize(int) noexcept;
+	bool finalize(thread_state result) noexcept;
 
 	// Cleanup after possibly deleting the thread instance
 	static void finalize() noexcept;
@@ -156,7 +145,7 @@ public:
 	u64 get_cycles();
 
 	// Wait for the thread (it does NOT change thread state, and can be called from multiple threads)
-	void join() const;
+	bool join() const;
 
 	// Notify the thread
 	void notify();
@@ -168,6 +157,9 @@ class thread_ctrl final
 	// Current thread
 	static thread_local thread_base* g_tls_this_thread;
 
+	// Error handling details
+	static thread_local void(*g_tls_error_callback)();
+
 	// Target cpu core layout
 	static atomic_t<native_core_arrangement> g_native_core_layout;
 
@@ -236,20 +228,8 @@ public:
 		_wait_for(-1, true);
 	}
 
-	// Wait until pred().
-	template <typename F, typename RT = std::invoke_result_t<F>>
-	static inline RT wait(F&& pred)
-	{
-		while (true)
-		{
-			if (RT result = pred())
-			{
-				return result;
-			}
-
-			_wait_for(-1, true);
-		}
-	}
+	// Exit.
+	[[noreturn]] static void emergency_exit(std::string_view reason);
 
 	// Get current thread (may be nullptr)
 	static thread_base* get_current()
@@ -268,6 +248,9 @@ public:
 
 	// Sets the preferred affinity mask for this thread
 	static void set_thread_affinity_mask(u64 mask);
+
+	// Miscellaneous
+	static u64 get_thread_affinity_mask();
 };
 
 // Derived from the callable object Context, possibly a lambda
@@ -279,9 +262,9 @@ class named_thread final : public Context, result_storage_t<Context>, thread_bas
 
 	// Type-erased thread entry point
 #ifdef _WIN32
-	static inline uint __stdcall entry_point(void* arg) try
+	static inline uint __stdcall entry_point(void* arg)
 #else
-	static inline void* entry_point(void* arg) try
+	static inline void* entry_point(void* arg)
 #endif
 	{
 		const auto _this = static_cast<named_thread*>(static_cast<thread*>(arg));
@@ -295,14 +278,19 @@ class named_thread final : public Context, result_storage_t<Context>, thread_bas
 		thread::finalize();
 		return 0;
 	}
-	catch (...)
-	{
-		catch_all_exceptions();
-	}
 
 	bool entry_point()
 	{
-		thread::initialize([](const void* data)
+		auto tls_error_cb = []()
+		{
+			if constexpr (!result::empty)
+			{
+				// Construct using default constructor in the case of failure
+				new (static_cast<result*>(static_cast<named_thread*>(thread_ctrl::get_current()))->get()) typename result::type();
+			}
+		};
+
+		thread::initialize(tls_error_cb, [](const void* data)
 		{
 			const auto _this = thread_ctrl::get_current();
 
@@ -338,7 +326,7 @@ class named_thread final : public Context, result_storage_t<Context>, thread_bas
 			new (result::get()) typename result::type(Context::operator()());
 		}
 
-		return thread::finalize(0);
+		return thread::finalize(thread_state::finished);
 	}
 
 	friend class thread_ctrl;
@@ -442,6 +430,11 @@ class named_thread_group final
 
 	Thread* m_threads;
 
+	void init_threads()
+	{
+		m_threads = static_cast<Thread*>(::operator new(sizeof(Thread) * m_count, std::align_val_t{alignof(Thread)}));
+	}
+
 public:
 	// Lambda constructor, also the implicit deduction guide candidate
 	named_thread_group(std::string_view name, u32 count, const Context& f)
@@ -453,7 +446,7 @@ public:
 			return;
 		}
 
-		m_threads = static_cast<Thread*>(::operator new(sizeof(Thread) * m_count, std::align_val_t{alignof(Thread)}));
+		init_threads();
 
 		// Create all threads
 		for (u32 i = 0; i < m_count; i++)
@@ -462,17 +455,43 @@ public:
 		}
 	}
 
+	// Default constructor
+	named_thread_group(std::string_view name, u32 count)
+		: m_count(count)
+		, m_threads(nullptr)
+	{
+		if (count == 0)
+		{
+			return;
+		}
+
+		init_threads();
+
+		// Create all threads
+		for (u32 i = 0; i < m_count; i++)
+		{
+			new (static_cast<void*>(m_threads + i)) Thread(std::string(name) + std::to_string(i + 1));
+		}
+	}
+
 	named_thread_group(const named_thread_group&) = delete;
 
 	named_thread_group& operator=(const named_thread_group&) = delete;
 
 	// Wait for completion
-	void join() const
+	bool join() const
 	{
+		bool result = true;
+
 		for (u32 i = 0; i < m_count; i++)
 		{
 			std::as_const(*std::launder(m_threads + i))();
+
+			if (std::as_const(*std::launder(m_threads + i)) != thread_state::finished)
+				result = false;
 		}
+
+		return result;
 	}
 
 	// Join and access specific thread

Utilities/VirtualMemory.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Utilities/Log.h"
+#include "util/logs.hpp"
 #include "VirtualMemory.h"
 #ifdef _WIN32
 #include <Windows.h>
@@ -141,8 +141,9 @@ namespace utils
 #endif
 	}
 
-	shm::shm(u32 size)
+	shm::shm(u32 size, u32 flags)
 		: m_size(::align(size, 0x10000))
+		, m_flags(flags)
 	{
 #ifdef _WIN32
 		m_handle = ::CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READWRITE, 0, m_size, NULL);
@@ -154,7 +155,7 @@ namespace utils
 #else
 		while ((m_file = ::shm_open("/rpcs3-mem1", O_RDWR | O_CREAT | O_EXCL, S_IWUSR | S_IRUSR)) == -1)
 		{
-			if (m_file == -1 && errno == EMFILE)
+			if (errno == EMFILE)
 			{
 				fmt::throw_exception("Too many open files. Raise the limit and try again.");
 			}

Utilities/VirtualMemory.h

@@ -48,9 +48,10 @@ namespace utils
 		int m_file;
 #endif
 		u32 m_size;
+		u32 m_flags;
 
 	public:
-		explicit shm(u32 size);
+		explicit shm(u32 size, u32 flags = 0);
 
 		shm(const shm&) = delete;
 
@@ -74,5 +75,11 @@ namespace utils
 		{
 			return m_size;
 		}
+
+		// Flags are unspecified, consider it userdata
+		u32 flags() const
+		{
+			return m_flags;
+		}
 	};
 }

Utilities/address_range.h

@@ -60,21 +60,26 @@ namespace utils
 			return (start1 >= start2 && end1 <= end2);
 		}
 
-		address_range(u32 _start, u32 _end) : start(_start), end(_end) {}
+		constexpr address_range(u32 _start, u32 _end) : start(_start), end(_end) {}
 
 	public:
 		// Constructors
-		address_range() = default;
-		address_range(const address_range &other) : start(other.start), end(other.end) {}
+		constexpr address_range() = default;
+		constexpr address_range(const address_range &other) : start(other.start), end(other.end) {}
 
-		static inline address_range start_length(u32 _start, u32 _length)
+		static constexpr address_range start_length(u32 _start, u32 _length)
 		{
-			return address_range(_start, _start + (_length - 1));
+			if (!_length)
+			{
+				return {};
+			}
+
+			return {_start, _start + (_length - 1)};
 		}
 
-		static inline address_range start_end(u32 _start, u32 _end)
+		static constexpr address_range start_end(u32 _start, u32 _end)
 		{
-			return address_range(_start, _end);
+			return {_start, _end};
 		}
 
 		// Length
@@ -176,9 +181,7 @@ namespace utils
 
 		void set_min_max(const address_range &other)
 		{
-			const address_range _range = get_min_max(other);
-			start = _range.start;
-			end = _range.end;
+			*this = get_min_max(other);
 		}
 
 		bool is_page_range() const

Utilities/asm.h

@@ -4,71 +4,6 @@
 
 namespace utils
 {
-	inline u32 cntlz32(u32 arg, bool nonzero = false)
-	{
-#ifdef _MSC_VER
-		ulong res;
-		return _BitScanReverse(&res, arg) || nonzero ? res ^ 31 : 32;
-#elif __LZCNT__
-		return _lzcnt_u32(arg);
-#else
-		return arg || nonzero ? __builtin_clz(arg) : 32;
-#endif
-	}
-
-	inline u64 cntlz64(u64 arg, bool nonzero = false)
-	{
-#ifdef _MSC_VER
-		ulong res;
-		return _BitScanReverse64(&res, arg) || nonzero ? res ^ 63 : 64;
-#elif __LZCNT__
-		return _lzcnt_u64(arg);
-#else
-		return arg || nonzero ? __builtin_clzll(arg) : 64;
-#endif
-	}
-
-	inline u32 cnttz32(u32 arg, bool nonzero = false)
-	{
-#ifdef _MSC_VER
-		ulong res;
-		return _BitScanForward(&res, arg) || nonzero ? res : 32;
-#elif __BMI__
-		return _tzcnt_u32(arg);
-#else
-		return arg || nonzero ? __builtin_ctz(arg) : 32;
-#endif
-	}
-
-	inline u64 cnttz64(u64 arg, bool nonzero = false)
-	{
-#ifdef _MSC_VER
-		ulong res;
-		return _BitScanForward64(&res, arg) || nonzero ? res : 64;
-#elif __BMI__
-		return _tzcnt_u64(arg);
-#else
-		return arg || nonzero ? __builtin_ctzll(arg) : 64;
-#endif
-	}
-
-	inline u8 popcnt32(u32 arg)
-	{
-#ifdef _MSC_VER
-		const u32 a1 = arg & 0x55555555;
-		const u32 a2 = (arg >> 1) & 0x55555555;
-		const u32 a3 = a1 + a2;
-		const u32 b1 = a3 & 0x33333333;
-		const u32 b2 = (a3 >> 2) & 0x33333333;
-		const u32 b3 = b1 + b2;
-		const u32 c3 = (b3 + (b3 >> 4)) & 0x0f0f0f0f;
-		const u32 d3 = c3 + (c3 >> 8);
-		return static_cast<u8>(d3 + (d3 >> 16));
-#else
-		return __builtin_popcount(arg);
-#endif
-	}
-
 // Rotate helpers
 #if defined(__GNUG__)
 

Utilities/bin_patch.cpp

@@ -1,5 +1,5 @@
 #include "bin_patch.h"
-#include <yaml-cpp/yaml.h>
+#include "util/yaml.hpp"
 #include "File.h"
 #include "Config.h"
 
@@ -34,15 +34,11 @@ void patch_engine::append(const std::string& patch)
 {
 	if (fs::file f{patch})
 	{
-		YAML::Node root;
+		auto [root, error] = yaml_load(f.to_string());
 
-		try
+		if (!error.empty())
 		{
-			root = YAML::Load(f.to_string());
-		}
-		catch (const std::exception& e)
-		{
-			patch_log.fatal("Failed to load patch file %s\n%s thrown: %s", patch, typeid(e).name(), e.what());
+			patch_log.fatal("Failed to load patch file %s:\n%s", patch, error);
 			return;
 		}
 

Utilities/cfmt.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "types.h"
-#include "asm.h"
 #include <climits>
 #include <string>
 #include <vector>
@@ -59,7 +58,7 @@ std::size_t cfmt_append(Dst& out, const Char* fmt, Src&& src)
 
 	const auto write_octal = [&](u64 value, u64 min_num)
 	{
-		out.resize(out.size() + std::max<u64>(min_num, 66 / 3 - (utils::cntlz64(value | 1, true) + 2) / 3), '0');
+		out.resize(out.size() + std::max<u64>(min_num, 66 / 3 - (std::countl_zero<u64>(value | 1) + 2) / 3), '0');
 
 		// Write in reversed order
 		for (auto i = out.rbegin(); value; i++, value /= 8)
@@ -70,7 +69,7 @@ std::size_t cfmt_append(Dst& out, const Char* fmt, Src&& src)
 
 	const auto write_hex = [&](u64 value, bool upper, u64 min_num)
 	{
-		out.resize(out.size() + std::max<u64>(min_num, 64 / 4 - utils::cntlz64(value | 1, true) / 4), '0');
+		out.resize(out.size() + std::max<u64>(min_num, 64 / 4 - std::countl_zero<u64>(value | 1) / 4), '0');
 
 		// Write in reversed order
 		for (auto i = out.rbegin(); value; i++, value /= 16)

Utilities/cond.cpp

@@ -1,4 +1,4 @@
-#include "cond.h"
+#include "cond.h"
 #include "sync.h"
 #include "lockless.h"
 
@@ -38,7 +38,7 @@ void cond_variable::imp_wake(u32 _count) noexcept
 		}
 
 		// Add signal
-		value += c_signal_mask & -c_signal_mask;
+		value += c_signal_mask & (0 - c_signal_mask);
 		return true;
 	});
 
@@ -47,7 +47,7 @@ void cond_variable::imp_wake(u32 _count) noexcept
 		return;
 	}
 
-	if (_count > 1 || ((_old + (c_signal_mask & -c_signal_mask)) & c_signal_mask) == c_signal_mask)
+	if (_count > 1 || ((_old + (c_signal_mask & (0 - c_signal_mask))) & c_signal_mask) == c_signal_mask)
 	{
 		// Resort to notify_all if signal count reached max
 		m_value.notify_all();

Utilities/cond.h

@@ -3,7 +3,6 @@
 #include "types.h"
 #include "util/atomic.hpp"
 #include <shared_mutex>
-#include "asm.h"
 
 // Lightweight condition variable
 class cond_variable

Utilities/git-version-gen.cmd

@@ -47,8 +47,9 @@ if errorlevel 1 (
 
 	echo // This is a generated file. > "%GIT_VERSION_FILE%"
 	echo. >> "%GIT_VERSION_FILE%"
-	echo #define RPCS3_GIT_VERSION "unknown" >> "%GIT_VERSION_FILE%"
-	echo #define RPCS3_GIT_BRANCH "unknown" >> "%GIT_VERSION_FILE%"
+	echo #define RPCS3_GIT_VERSION ^"local_build^" >> "%GIT_VERSION_FILE%"
+	echo #define RPCS3_GIT_BRANCH ^"local_build^" >> "%GIT_VERSION_FILE%"
+	echo #define RPCS3_GIT_FULL_BRANCH ^"local_build^" >> "%GIT_VERSION_FILE%"
 	echo. >> "%GIT_VERSION_FILE%"
 	echo // If you don't want this file to update/recompile, change to 1. >> "%GIT_VERSION_FILE%"
 	echo #define RPCS3_GIT_VERSION_NO_UPDATE 0 >> "%GIT_VERSION_FILE%"
@@ -58,30 +59,37 @@ if errorlevel 1 (
 rem // Get commit count from (unshallowed) HEAD
 for /F %%I IN ('call %GIT% rev-list HEAD --count') do set COMMIT_COUNT=%%I
 
-rem // If we're in AppVeyor, building a non-master, pull request artifact
-if defined APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH (
+if defined SYSTEM_PULLREQUEST_SOURCEBRANCH (
+	rem // These environment variables are defined by Azure pipelines
+	rem // BUILD_REPOSITORY_NAME will look like "RPCS3/rpcs3"
+	rem // SYSTEM_PULLREQUEST_SOURCEBRANCH will look like "master"
+	rem // BUILD_SOURCEBRANCHNAME will look like "master"
+	rem // See https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables
+	set GIT_FULL_BRANCH=%BUILD_REPOSITORY_NAME%/%BUILD_SOURCEBRANCHNAME%
 
-	if "%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%"=="master" (
+	if "%SYSTEM_PULLREQUEST_SOURCEBRANCH%"=="master" (
 		rem // If pull request comes from a master branch, GIT_BRANCH = username/branch in order to distinguish from upstream/master
-		for /f "tokens=1* delims=/" %%a in ("%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%") do set user=%%a
-		set "GIT_BRANCH=!user!/%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%"
+		for /f "tokens=1* delims=/" %%a in ("%BUILD_REPOSITORY_NAME%") do set user=%%a
+		set "GIT_BRANCH=!user!/%SYSTEM_PULLREQUEST_SOURCEBRANCH%"
 	) else (
 		rem // Otherwise, GIT_BRANCH=branch
-		set GIT_BRANCH=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%
+		set GIT_BRANCH=%SYSTEM_PULLREQUEST_SOURCEBRANCH%
 	)
 
 	rem // Make GIT_VERSION the last commit (shortened); Don't include commit count on non-master builds
 	for /F %%I IN ('call %GIT% rev-parse --short^=8 HEAD') do set GIT_VERSION=%%I
-
 ) else (
 	rem // Get last commit (shortened) and concat after commit count in GIT_VERSION
 	for /F %%I IN ('call %GIT% rev-parse --short^=8 HEAD') do set GIT_VERSION=%COMMIT_COUNT%-%%I
 
 	for /F %%I IN ('call %GIT% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%I
+
+	set GIT_FULL_BRANCH=local_build
 )
 
 rem // Echo obtained GIT_VERSION for debug purposes if needed
 echo %GIT_VERSION%
+echo %GIT_FULL_BRANCH%
 
 rem // Don't modify the file if it already has the current version.
 if exist "%GIT_VERSION_FILE%" (
@@ -95,6 +103,7 @@ echo // This is a generated file. > "%GIT_VERSION_FILE%"
 echo. >> "%GIT_VERSION_FILE%"
 echo #define RPCS3_GIT_VERSION "%GIT_VERSION%" >> "%GIT_VERSION_FILE%"
 echo #define RPCS3_GIT_BRANCH ^"%GIT_BRANCH%^" >> "%GIT_VERSION_FILE%"
+echo #define RPCS3_GIT_FULL_BRANCH ^"%GIT_FULL_BRANCH%^" >> "%GIT_VERSION_FILE%"
 echo. >> "%GIT_VERSION_FILE%"
 echo // If you don't want this file to update/recompile, change to 1. >> "%GIT_VERSION_FILE%"
 echo #define RPCS3_GIT_VERSION_NO_UPDATE 0 >> "%GIT_VERSION_FILE%"

Utilities/sysinfo.cpp

@@ -2,6 +2,7 @@
 #include "StrFmt.h"
 #include "File.h"
 #include "Emu/system_config.h"
+#include "Thread.h"
 
 #ifdef _WIN32
 #include "windows.h"
@@ -56,10 +57,10 @@ bool utils::has_mpx()
 	return g_value;
 }
 
-bool utils::has_512()
+bool utils::has_avx512()
 {
 	// Check AVX512F, AVX512CD, AVX512DQ, AVX512BW, AVX512VL extensions (Skylake-X level support)
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0xd0030000) == 0xd0030000 && (get_cpuid(1,0)[2] & 0x0C000000) == 0x0C000000 && (get_xgetbv(0) & 0xe6) == 0xe6;
+	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0xd0030000) == 0xd0030000 && (get_cpuid(1, 0)[2] & 0x0C000000) == 0x0C000000 && (get_xgetbv(0) & 0xe6) == 0xe6;
 	return g_value;
 }
 
@@ -75,6 +76,24 @@ bool utils::has_clwb()
 	return g_value;
 }
 
+bool utils::has_invariant_tsc()
+{
+	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(0x80000007, 0)[3] & 0x100) == 0x100;
+	return g_value;
+}
+
+bool utils::has_fma3()
+{
+	static const bool g_value = get_cpuid(0, 0)[0] >= 0x1 && get_cpuid(1, 0)[2] & 0x1000;
+	return g_value;
+}
+
+bool utils::has_fma4()
+{
+	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(0x80000001, 0)[2] & 0x10000) == 0x10000;
+	return g_value;
+}
+
 std::string utils::get_cpu_brand()
 {
 	std::string brand;
@@ -115,7 +134,7 @@ std::string utils::get_system_info()
 
 	if (const ullong tsc_freq = get_tsc_freq())
 	{
-		fmt::append(result, " | TSC: %.02fGHz", tsc_freq / 1000000000.);
+		fmt::append(result, " | TSC: %.03fGHz", tsc_freq / 1000000000.);
 	}
 	else
 	{
@@ -131,7 +150,7 @@ std::string utils::get_system_info()
 			result += '+';
 		}
 
-		if (has_512())
+		if (has_avx512())
 		{
 			result += '+';
 		}
@@ -142,6 +161,24 @@ std::string utils::get_system_info()
 		}
 	}
 
+	if (has_fma3() || has_fma4())
+	{
+		result += " | FMA";
+
+		if (has_fma3() && has_fma4())
+		{
+			result += "3+4";
+		}
+		else if (has_fma3())
+		{
+			result += "3";
+		}
+		else if (has_fma4())
+		{
+			result += "4";
+		}
+	}
+
 	if (has_rtm())
 	{
 		result += " | TSX";
@@ -155,7 +192,6 @@ std::string utils::get_system_info()
 		{
 			result += " disabled by default";
 		}
-
 	}
 
 	return result;
@@ -227,17 +263,81 @@ std::string utils::get_OS_version()
 	return output;
 }
 
+static constexpr ullong round_tsc(ullong val)
+{
+	return ::rounded_div(val, 1'000'000) * 1'000'000;
+}
+
 ullong utils::get_tsc_freq()
 {
+	static const ullong cal_tsc = []() -> ullong
+	{
+		if (!has_invariant_tsc())
+			return 0;
+
 #ifdef _WIN32
-	LARGE_INTEGER freq;
-	if (!QueryPerformanceFrequency(&freq) || freq.QuadPart > 9'999'999)
-		return 0;
-	return freq.QuadPart * 1024;
+		LARGE_INTEGER freq;
+		if (!QueryPerformanceFrequency(&freq))
+			return 0;
+
+		if (freq.QuadPart <= 9'999'999)
+			return round_tsc(freq.QuadPart * 1024);
+
+		const ullong timer_freq = freq.QuadPart;
 #else
-	// TODO
-	return 0;
+		const ullong timer_freq = 1'000'000'000;
 #endif
+
+		// Calibrate TSC
+		constexpr int samples = 40;
+		ullong rdtsc_data[samples];
+		ullong timer_data[samples];
+		ullong error_data[samples];
+
+		// Narrow thread affinity to a single core
+		const u64 old_aff = thread_ctrl::get_thread_affinity_mask();
+		thread_ctrl::set_thread_affinity_mask(old_aff & (0 - old_aff));
+
+#ifndef _WIN32
+		struct timespec ts0;
+		clock_gettime(CLOCK_MONOTONIC, &ts0);
+		ullong sec_base = ts0.tv_sec;
+#endif
+
+		for (int i = 0; i < samples; i++)
+		{
+#ifdef _WIN32
+			Sleep(1);
+			error_data[i] = (_mm_lfence(), __rdtsc());
+			LARGE_INTEGER ctr;
+			QueryPerformanceCounter(&ctr);
+			rdtsc_data[i] = (_mm_lfence(), __rdtsc());
+			timer_data[i] = ctr.QuadPart;
+#else
+			usleep(200);
+			error_data[i] = (_mm_lfence(), __rdtsc());
+			struct timespec ts;
+			clock_gettime(CLOCK_MONOTONIC, &ts);
+			rdtsc_data[i] = (_mm_lfence(), __rdtsc());
+			timer_data[i] = ts.tv_nsec + (ts.tv_sec - sec_base) * 1'000'000'000;
+#endif
+		}
+
+		// Restore main thread affinity
+		thread_ctrl::set_thread_affinity_mask(old_aff);
+
+		// Compute average TSC
+		ullong acc = 0;
+		for (int i = 0; i < samples - 1; i++)
+		{
+			acc += (rdtsc_data[i + 1] - rdtsc_data[i]) * timer_freq / (timer_data[i + 1] - timer_data[i]);
+		}
+
+		// Rounding
+		return round_tsc(acc / (samples - 1));
+	}();
+
+	return cal_tsc;
 }
 
 u64 utils::get_total_memory()

Utilities/sysinfo.h

@@ -41,12 +41,18 @@ namespace utils
 
 	bool has_mpx();
 
-	bool has_512();
+	bool has_avx512();
 
 	bool has_xop();
 
 	bool has_clwb();
 
+	bool has_invariant_tsc();
+
+	bool has_fma3();
+
+	bool has_fma4();
+
 	std::string get_cpu_brand();
 
 	std::string get_system_info();

Utilities/types.h

@@ -17,9 +17,12 @@
 #include <limits>
 #include <array>
 
-#if __has_include(<bit>)
-#include <bit>
+#ifdef _MSC_VER
+#ifndef __cpp_lib_bitops
+#define __cpp_lib_bitops
 #endif
+#endif
+#include <bit>
 
 #ifndef __has_builtin
 	#define __has_builtin(x) 0
@@ -46,7 +49,7 @@
 #define ASSUME(...) do { if (!(__VA_ARGS__)) __builtin_unreachable(); } while (0)  // note: the compiler will generate code to evaluate "cond" if the expression is opaque
 #endif
 
-#define SAFE_BUFFERS
+#define SAFE_BUFFERS __attribute__((no_stack_protector))
 #define NEVER_INLINE __attribute__((noinline))
 #define FORCE_INLINE __attribute__((always_inline)) inline
 #define RESTRICT __restrict__
@@ -167,6 +170,12 @@ using get_uint_t = typename get_int_impl<N>::utype;
 template <std::size_t N>
 using get_sint_t = typename get_int_impl<N>::stype;
 
+template <typename T>
+std::remove_cvref_t<T> as_rvalue(T&& obj)
+{
+    return std::forward<T>(obj);
+}
+
 // Formatting helper, type-specific preprocessing for improving safety and functionality
 template <typename T, typename = void>
 struct fmt_unveil;
@@ -822,19 +831,19 @@ struct alignas(A) any_pod
 
 	any_pod() = default;
 
-	template <typename T, typename T2 = TT<T>, typename = std::enable_if_t<std::is_pod<T2>::value && sizeof(T2) == S && alignof(T2) <= A>>
+	template <typename T, typename T2 = TT<T>, typename = std::enable_if_t<std::is_trivially_copyable_v<T> && sizeof(T2) == S && alignof(T2) <= A>>
 	any_pod(const T& value)
 	{
-		reinterpret_cast<T2&>(data) = value;
+		*this = std::bit_cast<any_pod>(value);
 	}
 
-	template <typename T, typename T2 = TT<T>, typename = std::enable_if_t<std::is_pod<T2>::value && sizeof(T2) == S && alignof(T2) <= A>>
+	template <typename T, typename T2 = TT<T>, typename = std::enable_if_t<std::is_trivially_copyable_v<T> && sizeof(T2) == S && alignof(T2) <= A>>
 	T2& as()
 	{
 		return reinterpret_cast<T2&>(data);
 	}
 
-	template <typename T, typename T2 = TT<T>, typename = std::enable_if_t<std::is_pod<T2>::value && sizeof(T2) == S && alignof(T2) <= A>>
+	template <typename T, typename T2 = TT<T>, typename = std::enable_if_t<std::is_trivially_copyable_v<T> && sizeof(T2) == S && alignof(T2) <= A>>
 	const T2& as() const
 	{
 		return reinterpret_cast<const T2&>(data);
@@ -899,7 +908,7 @@ struct cmd64 : any64
 	}
 };
 
-static_assert(sizeof(cmd64) == 8 && std::is_pod<cmd64>::value, "Incorrect cmd64 type");
+static_assert(sizeof(cmd64) == 8 && std::is_trivially_copyable_v<cmd64>, "Incorrect cmd64 type");
 
 // Error code type (return type), implements error reporting. Could be a template.
 struct error_code

Vulkan/glslang-build/glslang-build.vcxproj

@@ -36,29 +36,32 @@
   <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" >
-        <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
+  <PropertyGroup Label="UserMacros">
+    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
-msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)rpcs3_glslang.props /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
-msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)rpcs3_glslang.props /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
-msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)rpcs3_glslang.props /m</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DCMAKE_CXX_STANDARD=20 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../glslang
+      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DCMAKE_CXX_STANDARD=20 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../glslang
+      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DCMAKE_CXX_STANDARD=20 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../glslang
+      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <NMakeBuildCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
-      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)rpcs3_glslang.props /m
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DCMAKE_CXX_STANDARD=20 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../glslang
+      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
-      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)rpcs3_glslang.props /m
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DCMAKE_CXX_STANDARD=20 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../glslang
+      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
-      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)rpcs3_glslang.props /m
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DCMAKE_CXX_STANDARD=20 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../glslang
+      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeCleanCommandLine>
   </PropertyGroup>
   <ItemDefinitionGroup>

appveyor.yml

@@ -1,149 +0,0 @@
-
-version: '{build}'
-
-image: Visual Studio 2019
-
-environment:
-  QTDIR: C:\Qt\5.14\msvc2017_64
-  LLVMLIBS: https://github.com/RPCS3/llvm/releases/download/continuous-master/llvmlibs.7z
-  GLSLANG: https://www.dropbox.com/s/6e8w6t5dxh3ad4l/glslang.7z?dl=1
-  COMPATDB: https://rpcs3.net/compatibility?api=v1&export
-  VULKAN_SDK: "C:\\VulkanSDK\\1.1.126.0"
-  VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.1.126.0/windows/VulkanSDK-1.1.126.0-Installer.exe
-  VULKAN_SDK_SHA: ee86f25580b550390ce46508415e744d62e87e9c0de6cd299998058253a2a4ba
-
-cache:
-- glslang.7z -> appveyor.yml
-- compat_database.dat
-- vulkan-sdk.exe -> appveyor.yml
-
-install:
-- ps: | # set env vars for versioning
-    $env:COMM_TAG = $(Get-Content ./rpcs3/rpcs3_version.cpp | findstr 'version{.*}' | %{ $ver = $_ -split "[{,]"; "{0}.{1}.{2}" -f [int]$ver[1],[int]$ver[2],[int]$ver[3]; })
-    $env:COMM_COUNT = $(git rev-list --count HEAD)
-    $env:COMM_HASH = $(git rev-parse --short=8 HEAD)
-
-    if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
-        $env:BUILD = "rpcs3-v{0}-{1}_win64.7z" -f $env:COMM_TAG, $env:COMM_HASH
-        $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_HASH
-    }
-    else {
-        $env:BUILD = "rpcs3-v{0}-{1}-{2}_win64.7z" -f $env:COMM_TAG, $env:COMM_COUNT, $env:COMM_HASH
-        $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_COUNT
-    }
-
-- ps: | # used for experimental build warnings for pr builds
-    $env:BRANCH = "{0}/{1}/#{2}" -f $env:APPVEYOR_REPO_NAME, `
-      $env:APPVEYOR_REPO_BRANCH, $env:APPVEYOR_PULL_REQUEST_NUMBER
-    $env:BRANCH = $env:BRANCH -replace "/#$"
-
-- ps: | # misc global settings
-    $env:PATH += $env:QTDIR
-    [net.servicepointmanager]::securityprotocol = "tls12, tls11, tls"
-
-- ps: | # update and init submodules
-    git submodule -q update --init `
-      3rdparty/cereal `
-      3rdparty/ffmpeg `
-      3rdparty/span `
-      3rdparty/hidapi `
-      3rdparty/libpng `
-      3rdparty/libusb `
-      3rdparty/pugixml `
-      3rdparty/xxHash `
-      3rdparty/yaml-cpp `
-      3rdparty/zlib `
-      3rdparty/FAudio `
-      asmjit `
-      Vulkan/glslang
-
-platform: x64
-
-configuration: Release - LLVM
-
-build:
-  parallel: true
-  project: rpcs3.sln
-  verbosity: normal
-
-before_build:
-- ps: | # initialize mirror arrays and fetch precompiled build dependencies
-    $VULKAN_SDK_URLS = @(
-        $env:VULKAN_SDK_URL;
-        "$($env:VULKAN_SDK_URL)?Human=true";
-    )
-    if (!(test-path llvmlibs.7z)) { irm $env:LLVMLIBS -outfile llvmlibs.7z }
-    if (!(test-path glslang.7z)) { irm $env:GLSLANG -outfile glslang.7z }
-    7z x llvmlibs.7z -aos -o"." | out-null
-    7z x glslang.7z -aos -o".\lib\$env:CONFIGURATION-$env:PLATFORM" | out-null
-    if (!(test-path vulkan-sdk.exe))
-    {
-        foreach ($url in $VULKAN_SDK_URLS) {
-            irm $url -outfile vulkan-sdk.exe
-            if ($env:VULKAN_SDK_SHA -eq $(Get-FileHash .\vulkan-sdk.exe).Hash)
-            {
-                echo "Successfully downloaded and verified vulkan-sdk.exe!"
-                break
-            }
-            else
-            {
-                echo "Invalid file hash, Vulkan SDK Setup was possibly tampered with, retrying with a different mirror..."
-            }
-        }
-    }
-    .\vulkan-sdk.exe /S
-
-after_build:
-- ps: | # remove unnecessary files
-    rm .\bin\rpcs3.exp, .\bin\rpcs3.lib, .\bin\rpcs3.pdb
-
-- ps: | # prepare compatibility database for packaging
-    $db = irm $env:COMPATDB -erroraction silentlycontinue
-    if ($db -and $db.return_code -eq 0) {
-      $db | convertto-json -compress | out-file compat_database.dat -encoding utf8
-    }
-    copy-item compat_database.dat .\bin\GuiConfigs\compat_database.dat
-
-- ps: | # package artifacts
-    7z a -m0=LZMA2 -mx9 $env:BUILD .\bin\*
-    7z a -m0=LZMA2 -mx9 openssl_win64.7z C:\OpenSSL-v111-Win64\bin\libcrypto-1_1-x64.dll `
-      C:\OpenSSL-v111-Win64\bin\libssl-1_1-x64.dll
-    $env:FILESIZE = (Get-Item $env:BUILD).length
-
-- ps: | # generate sha256 hashes
-    (get-filehash $env:BUILD -algorithm SHA256).Hash | out-file ("{0}.sha256" -f $env:BUILD) -encoding ascii
-    $env:SHA256SUM = (get-filehash $env:BUILD -algorithm SHA256).Hash
-    (get-filehash openssl_win64.7z -algorithm SHA256).Hash | out-file "openssl_win64.7z.sha256" -encoding ascii
-
-test: off
-
-artifacts:
-- path: $(BUILD)
-  name: rpcs3
-- path: $(BUILD).sha256
-  name: rpcs3 sha256 hash
-- path: openssl_win64.7z
-  name: openssl
-- path: openssl_win64.7z.sha256
-  name: openssl sha256 hash
-
-deploy:
-    provider: GitHub
-    # Description is a semi-colon seperated list for easy parsing
-    description: "$(SHA256SUM);$(FILESIZE)B"
-    tag: build-$(APPVEYOR_REPO_COMMIT)
-    release: $(AVVER)
-    artifact: $(BUILD)
-    repository: RPCS3/rpcs3-binaries-win
-    draft: false
-    prerelease: false
-    force_update: true
-    auth_token:
-        secure: gTZqN6J9QNQTv9vu2qtExWk1x4o9dSfyTH/y86Yhe3qu+2w6Mly1MaDFMaXgrN1e
-    on:
-        branch: master
-        appveyor_repo_name: RPCS3/rpcs3
-
-on_success:
-- ps: | # update appveyor build version, done last to prevent webhook breakage
-    update-appveyorbuild -version $env:AVVER

azure-pipelines.yml

@@ -0,0 +1,100 @@
+trigger:
+  branches:
+    include:
+      - master
+  tags:
+    exclude:
+      - '*'
+pr:
+  branches:
+    include:
+      - master
+jobs:
+- job: Linux_Build
+  strategy:
+    matrix:
+      Clang:
+        COMPILER: clang
+      GCC:
+        COMPILER: gcc
+        DEPLOY_APPIMAGE: true
+  variables:
+    CCACHE_DIR: $(Pipeline.Workspace)/ccache
+    IS_AZURE: true
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - task: Cache@2
+    inputs:
+      key: ccache | $(Agent.OS) | $(COMPILER)
+      path: $(CCACHE_DIR)
+    displayName: ccache
+
+  - bash: |
+      docker pull --quiet rpcs3/rpcs3-travis-xenial:1.2
+      docker run                      \
+        -v $(pwd):/rpcs3              \
+        --env-file .ci/travis.env \
+        -v $CCACHE_DIR:/root/.ccache  \
+        -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
+        rpcs3/rpcs3-travis-xenial:1.2 \
+        /rpcs3/.ci/build-linux.sh
+    displayName: Docker setup and build
+
+  - publish: $(Build.ArtifactStagingDirectory)
+    condition: eq(variables['COMPILER'], 'gcc')
+
+- job: Windows_Build
+  variables:
+    COMPILER: msvc
+    QT_VER: '5.14.1'
+    QT_DATE: '202001240957'
+    QTDIR: C:\Qt\$(QT_VER)\msvc2017_64
+    VULKAN_VER: '1.1.126.0'
+    VULKAN_SDK_SHA: 'ee86f25580b550390ce46508415e744d62e87e9c0de6cd299998058253a2a4ba'
+    VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
+    CACHE_DIR: ./cache
+
+  pool:
+    vmImage: "windows-latest"
+
+  steps:
+    - task: Cache@2
+      inputs:
+        key: $(Agent.OS) | $(COMPILER)
+        path: $(CACHE_DIR)
+      displayName: Cache
+
+    - bash: .ci/setup-windows.sh
+      displayName: Download and unpack dependencies
+
+    - bash: .ci/export-azure-vars.sh
+      displayName: Export Variables
+
+    - task: VSBuild@1
+      inputs:
+        solution: 'rpcs3.sln'
+        msbuildArgs: '/m'
+        platform: x64
+        configuration: 'Release - LLVM'
+      displayName: Compile RPCS3
+
+    - bash: .ci/deploy-windows.sh
+      displayName: Pack up build artifacts
+
+    - publish: $(Build.ArtifactStagingDirectory)
+      artifact: Windows App Bundle
+
+    - task: GitHubRelease@1
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+      inputs:
+        gitHubConnection: 'RPCS3-Token'
+        repositoryName: 'RPCS3/rpcs3-binaries-win'
+        releaseNotesFilePath: 'GitHubReleaseMessage.txt'
+        action: 'create'
+        target: '7d09e3be30805911226241afbb14f8cdc2eb054e'
+        tagSource: 'userSpecifiedTag'
+        tag: 'build-$(Build.SourceVersion)'
+        title: $(AVVER)
+        addChangeLog: false
+      displayName: Push build to GitHub

common_default.props

@@ -6,10 +6,18 @@
   <PropertyGroup Label="Globals">
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <!-- Spectre mitigation is disabled by default unless WDK is installed -->
+    <SpectreMitigation>false</SpectreMitigation>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+      <PreprocessorDefinitions>_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>false</ExceptionHandling>
       <AdditionalOptions>-d2FH4- %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeLibrary Condition = "$(Configuration.Contains('Release'))">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition = "$(Configuration.Contains('Debug'))">MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalOptions>-d2:-FH4- %(AdditionalOptions)</AdditionalOptions>

llvm_build/llvm_build.vcxproj

@@ -34,38 +34,39 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" >
-        <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
+  <PropertyGroup Label="UserMacros">
+    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
+    <CmakeCLI>cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -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 -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_CXX_STANDARD=20 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../llvm</CmakeCLI>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <NMakePreprocessorDefinitions>
     </NMakePreprocessorDefinitions>
     <NMakeBuildCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -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 -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm
-      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m
+      $(CmakeCLI)
+      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -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 -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm
-      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m
+      $(CmakeCLI)
+      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -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 -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm
-      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m
+      $(CmakeCLI)
+      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <NMakePreprocessorDefinitions />
     <NMakeBuildCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -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 -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm
-      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m
+      $(CmakeCLI)
+      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -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 -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm
-      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m
+      $(CmakeCLI)
+      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>
-      cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -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 -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm
-      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m
+      $(CmakeCLI)
+      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(SolutionDir)common_default.props /m
     </NMakeCleanCommandLine>
   </PropertyGroup>
   <ItemDefinitionGroup>

rpcs3.sln

@@ -59,6 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro
 		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}
 		{FDC361C5-7734-493B-8CFB-037308B35122} = {FDC361C5-7734-493B-8CFB-037308B35122}
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}
@@ -81,6 +82,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "7z", "7z", "{CB3DD03E-074E-
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zlib", "3rdparty\7zlib.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wolfssl", "wolfssl", "{6DA34724-E5B2-4306-906D-1A2340637047}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "3rdparty\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcurl", "libcurl", "{BE02DA0B-BEE1-4214-AFA9-3617982F2FEA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "3rdparty\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {73973223-5EE8-41CA-8E88-1D60E89A237B}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - LLVM|x64 = Debug - LLVM|x64
@@ -249,6 +261,26 @@ Global
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release - LLVM|x64.Build.0 = Release|x64
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.ActiveCfg = Release|x64
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.Build.0 = Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - LLVM|x64.ActiveCfg = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - LLVM|x64.Build.0 = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - MemLeak|x64.Build.0 = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.Build.0 = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release - LLVM|x64.ActiveCfg = Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release - LLVM|x64.Build.0 = Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.ActiveCfg = Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.Build.0 = Release|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - MemLeak|x64.Build.0 = Debug|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|x64.ActiveCfg = Debug|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|x64.Build.0 = Debug|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.ActiveCfg = Release|x64
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -270,6 +302,8 @@ Global
 		{939FE206-1182-ABC3-1234-FEAB88E98404} = {D16E245C-CC5A-4B9A-8BAB-1176F02C1631}
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {6D8E86F7-84A0-45BA-ACC3-F02FC5545B3B}
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {CB3DD03E-074E-4FA5-B253-51A3372D1768}
+		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {6DA34724-E5B2-4306-906D-1A2340637047}
+		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {BE02DA0B-BEE1-4214-AFA9-3617982F2FEA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {06CC7920-E085-4B81-9582-8DE8AAD42510}

rpcs3/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.8.2)
 
-include(cotire)
+if(USE_PRECOMPILED_HEADERS AND NOT COMMAND target_precompile_headers)
+	include(cotire)
+endif()
 
 # Generate git-version.h at build time.
 include(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake)
@@ -110,12 +112,16 @@ else()
 	target_link_libraries(rpcs3 ${CMAKE_DL_LIBS})
 endif()
 
-if(USE_COTIRE)
-	set_target_properties(rpcs3 PROPERTIES
-		COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
-		COTIRE_ADD_UNITY_BUILD OFF)
+if(USE_PRECOMPILED_HEADERS)
+	if(COMMAND target_precompile_headers)
+		target_precompile_headers(rpcs3 PRIVATE "${RPCS3_SRC_DIR}/stdafx.h")
+	else()
+		set_target_properties(rpcs3 PROPERTIES
+			COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+			COTIRE_ADD_UNITY_BUILD OFF)
 
-	cotire(rpcs3)
+		cotire(rpcs3)
+	endif()
 endif()
 
 # Copy icons to executable directory
@@ -135,7 +141,7 @@ elseif(UNIX)
 elseif(WIN32)
 	add_custom_command(TARGET rpcs3 POST_BUILD
 			COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_SOURCE_DIR}/bin" "$<TARGET_FILE_DIR:rpcs3>"
-			COMMAND "${Qt5_DIR}/../../../bin/windeployqt" --no-angle --no-compiler-runtime --no-opengl-sw --no-patchqt --no-svg --no-translations --no-quick --plugindir "$<TARGET_FILE_DIR:rpcs3>/qt/plugins" "$<TARGET_FILE:rpcs3>")
+			COMMAND "${Qt5_DIR}/../../../bin/windeployqt" --no-angle --no-compiler-runtime --no-opengl-sw --no-patchqt --no-svg --no-translations --no-quick --plugindir "$<TARGET_FILE_DIR:rpcs3>/qt/plugins" --release "$<TARGET_FILE:rpcs3>")
 endif()
 
 # Unix installation

rpcs3/Crypto/key_vault.cpp

@@ -1,6 +1,7 @@
 #include "utils.h"
 #include "aes.h"
 #include "key_vault.h"
+#include "util/logs.hpp"
 
 LOG_CHANNEL(key_vault_log, "KEY_VAULT");
 
@@ -706,7 +707,7 @@ SELF_KEY KeyVault::FindSelfKey(u32 type, u16 revision, u64 version)
 	// Empty key.
 	SELF_KEY key(0, 0, 0, 0, "", "", "", "", 0);
 
-	key_vault_log.notice("FindSelfKey: Type:0x%x, Revision:0x%x, Version:0x%x", type, revision, version);
+	key_vault_log.trace("FindSelfKey: Type:0x%x, Revision:0x%x, Version:0x%x", type, revision, version);
 
 	// Check SELF type.
 	switch (type)

rpcs3/Crypto/key_vault.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "Utilities/types.h"
-#include "Utilities/Log.h"
 
 #include <string>
 #include <vector>
 #include <memory>
 
-enum SELF_KEY_TYPE {
+enum SELF_KEY_TYPE
+{
 	KEY_LV0 = 1,
 	KEY_LV1,
 	KEY_LV2,
@@ -18,7 +18,8 @@ enum SELF_KEY_TYPE {
 	KEY_NPDRM
 };
 
-struct SELF_KEY {
+struct SELF_KEY
+{
 	u64 version_start;
 	u64 version_end;
 	u16 revision;
@@ -44,6 +45,18 @@ static u8 PKG_AES_KEY2[0x10] = {
 	0x07, 0xf2, 0xc6, 0x82, 0x90, 0xb5, 0x0d, 0x2c, 0x33, 0x81, 0x8d, 0x70, 0x9b, 0x60, 0xe6, 0x2b
 };
 
+static u8 PKG_AES_KEY_VITA_1[0x10] = {
+	0xE3, 0x1A, 0x70, 0xC9, 0xCE, 0x1D, 0xD7, 0x2B, 0xF3, 0xC0, 0x62, 0x29, 0x63, 0xF2, 0xEC, 0xCB
+};
+
+static u8 PKG_AES_KEY_VITA_2[0x10] = {
+	0x42, 0x3A, 0xCA, 0x3A, 0x2B, 0xD5, 0x64, 0x9F, 0x96, 0x86, 0xAB, 0xAD, 0x6F, 0xD8, 0x80, 0x1F
+};
+
+static u8 PKG_AES_KEY_VITA_3[0x10] = {
+	0xAF, 0x07, 0xFD, 0x59, 0x65, 0x25, 0x27, 0xBA, 0xF1, 0x33, 0x89, 0x66, 0x8B, 0x17, 0xD9, 0xEA
+};
+
 static u8 NP_IDPS[0x10] = {
 	0x5E, 0x06, 0xE0, 0x4F, 0xD9, 0x4A, 0x71, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
 };
@@ -68,10 +81,12 @@ static u8 NP_RIF_KEY[0x10] = {
 	0xDA, 0x7D, 0x4B, 0x5E, 0x49, 0x9A, 0x4F, 0x53, 0xB1, 0xC1, 0xA1, 0x4A, 0x74, 0x84, 0x44, 0x3B
 };
 
+// PSP Minis
 static u8 NP_PSP_KEY_1[0x10] = {
 	0x2A, 0x6A, 0xFB, 0xCF, 0x43, 0xD1, 0x57, 0x9F, 0x7D, 0x73, 0x87, 0x41, 0xA1, 0x3B, 0xD4, 0x2E
 };
 
+// PSP Remasters
 static u8 NP_PSP_KEY_2[0x10] = {
 	0x0D, 0xB8, 0x57, 0x32, 0x36, 0x6C, 0xD7, 0x34, 0xFC, 0x87, 0x9E, 0x74, 0x33, 0x43, 0xBB, 0x4F
 };

rpcs3/Crypto/unedat.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "key_vault.h"
 #include "unedat.h"
 
@@ -578,7 +578,7 @@ int validate_npd_hashes(const char* file_name, const u8* klicensee, NPD_HEADER *
 	int title_hash_result = 0;
 	int dev_hash_result = 0;
 
-	const auto file_name_length = std::strlen(file_name);
+	const s32 file_name_length = ::narrow<s32>(std::strlen(file_name), HERE);
 	std::unique_ptr<u8[]> buf(new u8[0x30 + file_name_length]);
 
 	// Build the title buffer (content_id + file_name).

rpcs3/Crypto/unedat.h

@@ -18,6 +18,7 @@ struct loaded_npdrm_keys
 {
 	std::array<u8, 0x10> devKlic{};
 	std::array<u8, 0x10> rifKey{};
+	atomic_t<u32> npdrm_fds{0};
 };
 
 struct NPD_HEADER
@@ -112,8 +113,7 @@ public:
 		const s64 new_pos =
 			whence == fs::seek_set ? offset :
 			whence == fs::seek_cur ? offset + pos :
-			whence == fs::seek_end ? offset + size() :
-			(fmt::raw_error("EDATADecrypter::seek(): invalid whence"), 0);
+			whence == fs::seek_end ? offset + size() : -1;
 
 		if (new_pos < 0)
 		{

rpcs3/Crypto/unpkg.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include "Utilities/BEType.h"
+#include <sstream>
+#include <iomanip>
 
 // Constants
 enum
@@ -15,7 +17,7 @@ enum : u16
 	PKG_RELEASE_TYPE_DEBUG        = 0x0000,
 
 	PKG_PLATFORM_TYPE_PS3         = 0x0001,
-	PKG_PLATFORM_TYPE_PSP         = 0x0002,
+	PKG_PLATFORM_TYPE_PSP_PSVITA  = 0x0002,
 };
 
 enum : u32
@@ -24,6 +26,7 @@ enum : u32
 	PKG_FILE_ENTRY_NPDRMEDAT      = 2,
 	PKG_FILE_ENTRY_REGULAR        = 3,
 	PKG_FILE_ENTRY_FOLDER         = 4,
+	PKG_FILE_ENTRY_UNK0           = 5,
 	PKG_FILE_ENTRY_UNK1           = 6,
 	PKG_FILE_ENTRY_SDAT           = 9,
 
@@ -34,12 +37,12 @@ enum : u32
 // Structs
 struct PKGHeader
 {
-	nse_t<u32> pkg_magic;   // Magic (0x7f504b47)
+	le_t<u32> pkg_magic;    // Magic (0x7f504b47) (" PKG")
 	be_t<u16> pkg_type;     // Release type (Retail:0x8000, Debug:0x0000)
 	be_t<u16> pkg_platform; // Platform type (PS3:0x0001, PSP:0x0002)
-	be_t<u32> pkg_info_off;
-	be_t<u32> pkg_info_num;
-	be_t<u32> header_size;  // Header size
+	be_t<u32> meta_offset;  // Metadata offset. Usually 0xC0 for PS3, usually 0x280 for PSP and PSVita
+	be_t<u32> meta_count;   // Metadata item count
+	be_t<u32> meta_size;    // Metadata size.
 	be_t<u32> file_count;   // Number of files
 	be_t<u64> pkg_size;     // PKG size in bytes
 	be_t<u64> data_offset;  // Encrypted data offset
@@ -47,6 +50,23 @@ struct PKGHeader
 	char title_id[48];      // Title ID
 	be_t<u64> qa_digest[2]; // This should be the hash of "files + attribs"
 	be_t<u128> klicensee;   // Nonce
+	// + some stuff
+};
+
+// Extended header in PSP and PSVita packages
+struct PKGExtHeader
+{
+	le_t<u32> magic;                            // 0x7F657874 (" ext")
+	be_t<u32> unknown_1;                        // Maybe version. always 1
+	be_t<u32> ext_hdr_size;                     // Extended header size. ex: 0x40
+	be_t<u32> ext_data_size;                    // ex: 0x180
+	be_t<u32> main_and_ext_headers_hmac_offset; // ex: 0x100
+	be_t<u32> metadata_header_hmac_offset;      // ex: 0x360, 0x390, 0x490 
+	be_t<u64> tail_offset;                      // tail size seams to be always 0x1A0
+	be_t<u32> padding1;
+	be_t<u32> pkg_key_id;                       // Id of the AES key used for decryption. PSP = 0x1, PSVita = 0xC0000002, PSM = 0xC0000004
+	be_t<u32> full_header_hmac_offset;          // ex: none (old pkg): 0, 0x930
+	u8 padding2[20];
 };
 
 struct PKGEntry
@@ -59,4 +79,218 @@ struct PKGEntry
 	be_t<u32> pad;          // Padding (zeros)
 };
 
-bool pkg_install(const std::string& path, atomic_t<double>&);
+// https://www.psdevwiki.com/ps3/PKG_files#PKG_Metadata
+struct PKGMetaData
+{
+private:
+	static std::string to_hex_string(u8 buf[], size_t size)
+	{
+		std::stringstream sstream;
+		for (size_t i = 0; i < size; i++)
+		{
+			sstream << std::hex << std::setw(2) << std::setfill('0') << static_cast<int>(buf[i]);
+		}
+		return sstream.str();
+	}
+	static std::string to_hex_string(u8 buf[], size_t size, size_t dotpos)
+	{
+		std::string result = to_hex_string(buf, size);
+		if (result.size() > dotpos)
+		{
+			result.insert(dotpos, 1, '.');
+		}
+		return result;
+	}
+public:
+	be_t<u32> drm_type{ 0 };
+	be_t<u32> content_type{ 0 };
+	be_t<u32> package_type{ 0 };
+	be_t<u64> package_size{ 0 };
+	u8 qa_digest[24]{ 0 };
+
+	be_t<u64> unk_0x9{ 0 };
+	be_t<u64> unk_0xB{ 0 };
+
+	struct package_revision
+	{
+		struct package_revision_data
+		{
+			u8 make_package_npdrm_ver[2]{ 0 };
+			u8 version[2]{ 0 };
+		} data{};
+
+		std::string make_package_npdrm_ver;
+		std::string version;
+
+		void interpret_data()
+		{
+			make_package_npdrm_ver = to_hex_string(data.make_package_npdrm_ver, sizeof(data.make_package_npdrm_ver));
+			version = to_hex_string(data.version, sizeof(data.version), 2);
+		}
+		std::string to_string()
+		{
+			return fmt::format("make package npdrm version: %s, version: %s", make_package_npdrm_ver, version);
+		}
+	} package_revision;
+
+	struct software_revision
+	{
+		struct software_revision_data
+		{
+			u8 unk[1]{ 0 };
+			u8 firmware_version[3]{ 0 };
+			u8 version[2]{ 0 };
+			u8 app_version[2]{ 0 };
+		} data{};
+
+		std::string unk; // maybe hardware id
+		std::string firmware_version;
+		std::string version;
+		std::string app_version;
+
+		void interpret_data()
+		{
+			unk = to_hex_string(data.unk, sizeof(data.unk));
+			firmware_version = to_hex_string(data.firmware_version, sizeof(data.firmware_version), 2);
+			version = to_hex_string(data.version, sizeof(data.version), 2);
+			app_version = to_hex_string(data.app_version, sizeof(data.app_version), 2);
+		}
+		std::string to_string()
+		{
+			return fmt::format("unk: %s, firmware version: %s, version: %s, app version: %s",
+				unk, firmware_version, version, app_version);
+		}
+	} software_revision;
+
+	std::string title_id;
+	std::string install_dir;
+
+	// PSVita stuff
+
+	struct vita_item_info // size is 0x28 (40)
+	{
+		be_t<u32> offset{ 0 };
+		be_t<u32> size{ 0 };
+		u8 sha256[32]{ 0 };
+
+		std::string to_string()
+		{
+			return fmt::format("offset: 0x%x, size: 0x%x, sha256: 0x%x", offset, size, sha256);
+		}
+	} item_info;
+
+	struct vita_sfo_info // size is 0x38 (56)
+	{
+		be_t<u32> param_offset{ 0 };
+		be_t<u16> param_size{ 0 };
+		be_t<u32> unk_1{ 0 };           // seen values: 0x00000001-0x00000018, 0x0000001b-0x0000001c
+		be_t<u32> psp2_system_ver{ 0 }; // BCD encoded
+		u8 unk_2[8]{ 0 };
+		u8 param_digest[32]{ 0 };       // SHA256 of param_data. Called ParamDigest: This is sha256 digest of param.sfo.
+
+		std::string to_string()
+		{
+			return fmt::format("param_offset: 0x%x, param_size: 0x%x, unk_1: 0x%x, psp2_system_ver: 0x%x, unk_2: 0x%x, param_digest: 0x%x",
+				param_offset, param_size, unk_1, psp2_system_ver, unk_2, param_digest);
+		}
+	} sfo_info;
+
+	struct vita_unknown_data_info // size is 0x48 (72)
+	{
+		be_t<u32> unknown_data_offset{ 0 };
+		be_t<u16> unknown_data_size{ 0 };   // ex: 0x320
+		u8 unk[32]{ 0 };
+		u8 unknown_data_sha256[32]{ 0 };
+
+		std::string to_string()
+		{
+			return fmt::format("unknown_data_offset: 0x%x, unknown_data_size: 0x%x, unk: 0x%x, unknown_data_sha256: 0x%x",
+				unknown_data_offset, unknown_data_size, unk, unknown_data_sha256);
+		}
+	} unknown_data_info;
+
+	struct vita_entirety_info // size is 0x38 (56)
+	{
+		be_t<u32> entirety_data_offset{ 0 }; // located just before SFO
+		be_t<u32> entirety_data_size{ 0 };   // ex: 0xA0, C0, 0x100, 0x120, 0x160
+		be_t<u16> flags{ 0 };                // ex: EE 00, FE 10, FE 78, FE F8, FF 10, FF 90, FF D0, flags indicating which digests it embeds
+		be_t<u16> unk_1{ 0 };                // always 00 00
+		be_t<u32> unk_2{ 0 };                // ex: 1, 0
+		u8 unk_3[8]{ 0 };
+		u8 entirety_digest[32]{ 0 };
+
+		std::string to_string()
+		{
+			return fmt::format("entirety_data_offset: 0x%x, entirety_data_size: 0x%x, flags: 0x%x, unk_1: 0x%x, unk_2: 0x%x, unk_3: 0x%x, entirety_digest: 0x%x",
+				entirety_data_offset, entirety_data_size, flags, unk_1, unk_2, unk_3, entirety_digest);
+		}
+	} entirety_info;
+
+	struct vita_version_info // size is 0x28 (40)
+	{
+		be_t<u32> publishing_tools_version{ 0 };
+		be_t<u32> psf_builder_version{ 0 };
+		u8 padding[32]{ 0 };
+
+		std::string to_string()
+		{
+			return fmt::format("publishing_tools_version: 0x%x, psf_builder_version: 0x%x, padding: 0x%x",
+				publishing_tools_version, psf_builder_version, padding);
+		}
+	} version_info;
+
+	struct vita_self_info // size is 0x38 (56)
+	{
+		be_t<u32> self_info_offset{ 0 }; // offset to the first self_info_data_element
+		be_t<u32> self_info_size{ 0 };   // usually 0x10 or 0x20
+		u8 unk[16]{ 0 };
+		u8 self_sha256[32]{ 0 };
+
+		std::string to_string()
+		{
+			return fmt::format("self_info_offset: 0x%x, self_info_size: 0x%x, unk: 0x%x, self_sha256: 0x%x",
+				self_info_offset, self_info_size, unk, self_sha256);
+		}
+	} self_info;
+};
+
+enum class package_error
+{
+	no_error,
+	app_version,
+	other
+};
+
+class package_reader
+{
+public:
+	package_reader(const std::string& path);
+	~package_reader();
+
+	package_error check_target_app_version();
+	bool extract_data(atomic_t<double>& sync);
+
+private:
+	bool read_header();
+	bool read_metadata();
+	bool decrypt_data();
+	void archive_seek(const s64 new_offset, const fs::seek_mode damode = fs::seek_set);
+	u64 archive_read(void* data_ptr, const u64 num_bytes);
+	u64 decrypt(u64 offset, u64 size, const uchar* key);
+
+	const std::size_t BUF_SIZE = 8192 * 1024; // 8 MB
+
+	bool m_is_valid = false;
+
+	std::string m_path;
+	std::string install_dir;
+	std::vector<fs::file> filelist;
+	size_t cur_file = 0;
+	u64 cur_offset = 0;
+	u64 cur_file_offset = 0;
+	std::unique_ptr<u128[]> buf;
+	std::array<uchar, 16> dec_key{};
+
+	PKGHeader header{};
+	PKGMetaData metadata{};
+};

rpcs3/Crypto/unself.cpp

@@ -744,7 +744,7 @@ bool SCEDecrypter::DecryptData()
 	// Calculate the total data size.
 	for (unsigned int i = 0; i < meta_hdr.section_count; i++)
 	{
-		data_buf_length += meta_shdr[i].data_size;
+		data_buf_length += ::narrow<u32>(meta_shdr[i].data_size, HERE);
 	}
 
 	// Allocate a buffer to store decrypted data.
@@ -798,7 +798,7 @@ bool SCEDecrypter::DecryptData()
 		}
 
 		// Advance the buffer's offset.
-		data_buf_offset += meta_shdr[i].data_size;
+		data_buf_offset += ::narrow<u32>(meta_shdr[i].data_size, HERE);
 	}
 
 	return true;
@@ -828,7 +828,7 @@ std::vector<fs::file> SCEDecrypter::MakeFile()
 			strm.zalloc = Z_NULL;
 			strm.zfree = Z_NULL;
 			strm.opaque = Z_NULL;
-			strm.avail_in = meta_shdr[i].data_size;
+			strm.avail_in = ::narrow<uInt>(meta_shdr[i].data_size, HERE);
 			strm.avail_out = BUFSIZE;
 			strm.next_in = data_buf.get()+data_buf_offset;
 			strm.next_out = tempbuf;
@@ -873,7 +873,7 @@ std::vector<fs::file> SCEDecrypter::MakeFile()
 		}
 
 		// Advance the data buffer offset by data size.
-		data_buf_offset += meta_shdr[i].data_size;
+		data_buf_offset += ::narrow<u32>(meta_shdr[i].data_size, HERE);
 
 		if (out_f.pos() != out_f.size())
 			fmt::throw_exception("MakeELF written bytes (%llu) does not equal buffer size (%llu).", out_f.pos(), out_f.size());
@@ -1238,7 +1238,7 @@ bool SELFDecrypter::DecryptData()
 		if (meta_shdr[i].encrypted == 3)
 		{
 			if ((meta_shdr[i].key_idx <= meta_hdr.key_count - 1) && (meta_shdr[i].iv_idx <= meta_hdr.key_count))
-				data_buf_length += meta_shdr[i].data_size;
+				data_buf_length += ::narrow<u32>(meta_shdr[i].data_size, HERE);
 		}
 	}
 
@@ -1284,7 +1284,7 @@ bool SELFDecrypter::DecryptData()
 				memcpy(data_buf.get() + data_buf_offset, buf.get(), meta_shdr[i].data_size);
 
 				// Advance the buffer's offset.
-				data_buf_offset += meta_shdr[i].data_size;
+				data_buf_offset += ::narrow<u32>(meta_shdr[i].data_size, HERE);
 			}
 		}
 	}

rpcs3/Crypto/unself.h

@@ -1,11 +1,11 @@
-#pragma once
+#pragma once
 
 #include "key_vault.h"
 #include "zlib.h"
 
 #include "Utilities/types.h"
 #include "Utilities/File.h"
-#include "Utilities/Log.h"
+#include "util/logs.hpp"
 
 LOG_CHANNEL(self_log, "SELF");
 
@@ -489,7 +489,7 @@ private:
 				}
 
 				// Advance the data buffer offset by data size.
-				data_buf_offset += meta_shdr[i].data_size;
+				data_buf_offset += ::narrow<u32>(meta_shdr[i].data_size, HERE);
 			}
 		}
 

rpcs3/Crypto/utils.cpp

@@ -6,8 +6,12 @@
 #include <cstring>
 #include <stdio.h>
 #include <time.h>
+#include "Utilities/StrUtil.h"
+#include "Utilities/span.h"
 
 #include <memory>
+#include <string>
+#include <string_view>
 
 // Auxiliary functions (endian swap, xor).
 
@@ -142,11 +146,14 @@ void cmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, int in_
 
 char* extract_file_name(const char* file_path, char real_file_name[MAX_PATH])
 {
-	size_t file_path_len = strlen(file_path);
-	const char* p = strrchr(file_path, '/');
-	if (!p) p = strrchr(file_path, '\\');
-	if (p) file_path_len = file_path + file_path_len - p - 1;
-	strncpy(real_file_name, p ? (p + 1) : file_path, file_path_len + 1);
+	std::string_view v(file_path);
 
+	if (auto pos = v.find_last_of("/\\"); pos != umax)
+	{
+		v.remove_prefix(pos + 1);
+	}
+
+	gsl::span r(real_file_name, MAX_PATH);
+	strcpy_trunc(r, v);
 	return real_file_name;
 }

rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp

@@ -2,7 +2,7 @@
 #error "XAudio2 can only be built on Windows."
 #endif
 
-#include "Utilities/Log.h"
+#include "util/logs.hpp"
 #include "Utilities/StrFmt.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"

rpcs3/Emu/CMakeLists.txt

@@ -31,13 +31,15 @@ target_sources(rpcs3_emu PRIVATE
 	../util/atomic2.cpp
 	../util/shared_cptr.cpp
 	../util/fixed_typemap.cpp
+	../util/logs.cpp
+	../util/yaml.cpp
+	../util/cereal.cpp
 	../../Utilities/bin_patch.cpp
 	../../Utilities/cond.cpp
 	../../Utilities/Config.cpp
 	../../Utilities/dynamic_library.cpp
 	../../Utilities/File.cpp
 	../../Utilities/JIT.cpp
-	../../Utilities/Log.cpp
 	../../Utilities/LUrlParser.cpp
 	../../Utilities/mutex.cpp
 	../../Utilities/rXml.cpp
@@ -62,6 +64,12 @@ else()
 	set_source_files_properties("../../Utilities/JIT.cpp" PROPERTIES COMPILE_FLAGS -fno-rtti)
 endif()
 
+if (MSVC)
+	set_source_files_properties("../util/yaml.cpp" PROPERTIES COMPILE_FLAGS /EHsc)
+else()
+	set_source_files_properties("../util/yaml.cpp" PROPERTIES COMPILE_FLAGS -fexceptions)
+endif()
+
 
 # Crypto
 target_sources(rpcs3_emu PRIVATE
@@ -351,6 +359,10 @@ target_sources(rpcs3_emu PRIVATE
 	Io/GHLtar.cpp
 )
 
+# Np
+target_sources(rpcs3_emu PRIVATE
+	NP/np_handler.cpp
+)
 
 # Memory
 target_sources(rpcs3_emu PRIVATE
@@ -384,6 +396,7 @@ target_sources(rpcs3_emu PRIVATE
 	RSX/Overlays/overlay_list_view.cpp
 	RSX/Overlays/overlay_message_dialog.cpp
 	RSX/Overlays/overlay_osk.cpp
+	RSX/Overlays/overlay_osk_panel.cpp
 	RSX/Overlays/overlay_perf_metrics.cpp
 	RSX/Overlays/overlay_progress_bar.cpp
 	RSX/Overlays/overlay_save_dialog.cpp
@@ -396,11 +409,13 @@ target_sources(rpcs3_emu PRIVATE
 	RSX/Capture/rsx_capture.cpp
 	RSX/Capture/rsx_replay.cpp
 	RSX/GL/GLCommonDecompiler.cpp
+	RSX/GL/GLDraw.cpp
 	RSX/GL/GLFragmentProgram.cpp
 	RSX/GL/GLGSRender.cpp
 	RSX/GL/GLHelpers.cpp
 	RSX/GL/GLPresent.cpp
 	RSX/GL/GLRenderTargets.cpp
+	RSX/GL/GLShaderInterpreter.cpp
 	RSX/GL/GLTexture.cpp
 	RSX/GL/GLVertexBuffers.cpp
 	RSX/GL/GLVertexProgram.cpp
@@ -412,6 +427,7 @@ if(TARGET 3rdparty_vulkan)
 		RSX/VK/VKCommandStream.cpp
 		RSX/VK/VKCommonDecompiler.cpp
 		RSX/VK/VKDMA.cpp
+		RSX/VK/VKDraw.cpp
 		RSX/VK/VKFormats.cpp
 		RSX/VK/VKFragmentProgram.cpp
 		RSX/VK/VKFramebuffer.cpp
@@ -423,6 +439,7 @@ if(TARGET 3rdparty_vulkan)
 		RSX/VK/VKRenderPass.cpp
 		RSX/VK/VKResolveHelper.cpp
 		RSX/VK/VKResourceManager.cpp
+		RSX/VK/VKShaderInterpreter.cpp
 		RSX/VK/VKTexture.cpp
 		RSX/VK/VKVertexBuffers.cpp
 		RSX/VK/VKVertexProgram.cpp
@@ -440,13 +457,17 @@ target_link_libraries(rpcs3_emu
 )
 
 
-if (USE_COTIRE)
-	# Setup cotire
-	option(UNITY_BUILD_EMU "Use unity build for rpcs3_emu target" OFF)
+if (USE_PRECOMPILED_HEADERS)
+	if (COMMAND target_precompile_headers)
+		target_precompile_headers(rpcs3_emu PRIVATE "${RPCS3_SRC_DIR}/stdafx.h")
+	else()
+		# Setup cotire
+		option(UNITY_BUILD_EMU "Use unity build for rpcs3_emu target" OFF)
 
-	set_target_properties(rpcs3_emu PROPERTIES
-		COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
-		COTIRE_ADD_UNITY_BUILD ${UNITY_BUILD_EMU})
+		set_target_properties(rpcs3_emu PROPERTIES
+			COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+			COTIRE_ADD_UNITY_BUILD ${UNITY_BUILD_EMU})
 
-	cotire(rpcs3_emu)
+		cotire(rpcs3_emu)
+	endif()
 endif()

rpcs3/Emu/CPU/CPUThread.cpp

@@ -84,12 +84,11 @@ struct cpu_prof
 		void print(u32 id) const
 		{
 			// Make reversed map: sample_count -> name
-			std::multimap<u64, u64> chart;
+			std::multimap<u64, u64, std::greater<u64>> chart;
 
 			for (auto& [name, count] : freq)
 			{
-				// Inverse bits to sort in descending order
-				chart.emplace(~count, name);
+				chart.emplace(count, name);
 			}
 
 			// Print results
@@ -99,10 +98,8 @@ struct cpu_prof
 			// Fraction of non-idle samples
 			const f64 busy = 1. * (samples - idle) / samples;
 
-			for (auto& [rcount, name] : chart)
+			for (auto& [count, name] : chart)
 			{
-				// Get correct count value
-				const u64 count = ~rcount;
 				const f64 _frac = count / busy / samples;
 
 				// Print only 7 hash characters out of 11 (which covers roughly 48 bits)
@@ -243,28 +240,83 @@ using cpu_profiler = named_thread<cpu_prof>;
 
 thread_local cpu_thread* g_tls_current_cpu_thread = nullptr;
 
-// For synchronizing suspend_all operation
-alignas(64) shared_mutex g_cpu_suspend_lock;
+struct cpu_counter
+{
+	// For synchronizing suspend_all operation
+	alignas(64) shared_mutex cpu_suspend_lock;
 
-// Semaphore for global thread array (global counter)
-alignas(64) atomic_t<u32> g_cpu_array_sema{0};
+	// Semaphore for global thread array (global counter)
+	alignas(64) atomic_t<u32> cpu_array_sema{0};
 
-// Semaphore subdivision for each array slot (64 x N in total)
-atomic_t<u64> g_cpu_array_bits[6]{};
+	// Semaphore subdivision for each array slot (64 x N in total)
+	atomic_t<u64> cpu_array_bits[6]{};
 
-// All registered threads
-atomic_t<cpu_thread*> g_cpu_array[sizeof(g_cpu_array_bits) * 8]{};
+	// All registered threads
+	atomic_t<cpu_thread*> cpu_array[sizeof(cpu_array_bits) * 8]{};
+
+	u64 add(cpu_thread* _this)
+	{
+		if (!cpu_array_sema.try_inc(sizeof(cpu_counter::cpu_array_bits) * 8))
+		{
+			return -1;
+		}
+
+		u64 array_slot = -1;
+
+		for (u32 i = 0;; i = (i + 1) % ::size32(cpu_array_bits))
+		{
+			const auto [bits, ok] = cpu_array_bits[i].fetch_op([](u64& bits) -> u64
+			{
+				if (~bits) [[likely]]
+				{
+					// Set lowest clear bit
+					bits |= bits + 1;
+					return true;
+				}
+
+				return false;
+			});
+
+			if (ok) [[likely]]
+			{
+				// Get actual slot number
+				array_slot = i * 64 + std::countr_one(bits);
+				break;
+			}
+		}
+
+		// Register and wait if necessary
+		verify("cpu_counter::add()" HERE), cpu_array[array_slot].exchange(_this) == nullptr;
+
+		_this->state += cpu_flag::wait;
+		cpu_suspend_lock.lock_unlock();
+		return array_slot;
+	}
+
+	void remove(cpu_thread* _this, u64 slot)
+	{
+		// Unregister and wait if necessary
+		_this->state += cpu_flag::wait;
+		if (cpu_array[slot].exchange(nullptr) != _this)
+			sys_log.fatal("Inconsistency for array slot %u", slot);
+		cpu_array_bits[slot / 64] &= ~(1ull << (slot % 64));
+		cpu_array_sema--;
+		cpu_suspend_lock.lock_unlock();
+	}
+};
 
 template <typename F>
 void for_all_cpu(F&& func) noexcept
 {
-	for (u32 i = 0; i < ::size32(g_cpu_array_bits); i++)
-	{
-		for (u64 bits = g_cpu_array_bits[i]; bits; bits &= bits - 1)
-		{
-			const u64 index = i * 64 + utils::cnttz64(bits, true);
+	auto ctr = g_fxo->get<cpu_counter>();
 
-			if (cpu_thread* cpu = g_cpu_array[index].load())
+	for (u32 i = 0; i < ::size32(ctr->cpu_array_bits); i++)
+	{
+		for (u64 bits = ctr->cpu_array_bits[i]; bits; bits &= bits - 1)
+		{
+			const u64 index = i * 64 + std::countr_zero(bits);
+
+			if (cpu_thread* cpu = ctr->cpu_array[index].load())
 			{
 				func(cpu);
 			}
@@ -301,53 +353,79 @@ void cpu_thread::operator()()
 		}
 	}
 
-	if (id_type() == 1 && false)
+	while (!g_fxo->get<cpu_counter>() && !g_fxo->get<cpu_profiler>())
 	{
-		g_fxo->get<cpu_profiler>()->registered.push(id);
+		// Can we have a little race, right? First thread is started concurrently with g_fxo->init()
+		std::this_thread::sleep_for(1ms);
 	}
 
-	if (id_type() == 2 && g_cfg.core.spu_prof)
+	switch (id_type())
 	{
-		g_fxo->get<cpu_profiler>()->registered.push(id);
+	case 1:
+	{
+		//g_fxo->get<cpu_profiler>()->registered.push(id);
+		break;
+	}
+	case 2:
+	{
+		if (g_cfg.core.spu_prof)
+		{
+			g_fxo->get<cpu_profiler>()->registered.push(id);
+		}
+
+		break;
+	}
+	default: break;
 	}
 
 	// Register thread in g_cpu_array
-	if (!g_cpu_array_sema.try_inc(sizeof(g_cpu_array_bits) * 8))
+	const u64 array_slot = g_fxo->get<cpu_counter>()->add(this);
+
+	if (array_slot == umax)
 	{
 		sys_log.fatal("Too many threads.");
-		Emu.Pause();
 		return;
 	}
 
-	u64 array_slot = -1;
-
-	for (u32 i = 0;; i = (i + 1) % ::size32(g_cpu_array_bits))
+	static thread_local struct thread_cleanup_t
 	{
-		const auto [bits, ok] = g_cpu_array_bits[i].fetch_op([](u64& bits) -> u64
+		cpu_thread* _this;
+		u64 slot;
+		std::string name;
+
+		thread_cleanup_t(cpu_thread* _this, u64 slot)
+			: _this(_this)
+			, slot(slot)
+			, name(thread_ctrl::get_name())
 		{
-			if (~bits) [[likely]]
+		}
+
+		void cleanup()
+		{
+			if (_this == nullptr)
 			{
-				// Set lowest clear bit
-				bits |= bits + 1;
-				return true;
+				return;
 			}
 
-			return false;
-		});
+			if (auto ptr = vm::g_tls_locked)
+			{
+				ptr->compare_and_swap(_this, nullptr);
+			}
 
-		if (ok) [[likely]]
-		{
-			// Get actual slot number
-			array_slot = i * 64 + utils::cnttz64(~bits, false);
-			break;
+			g_fxo->get<cpu_counter>()->remove(_this, slot);
+
+			_this = nullptr;
 		}
-	}
 
-	// Register and wait if necessary
-	verify("g_cpu_array[...] -> this" HERE), g_cpu_array[array_slot].exchange(this) == nullptr;
-
-	state += cpu_flag::wait;
-	g_cpu_suspend_lock.lock_unlock();
+		~thread_cleanup_t()
+		{
+			if (_this)
+			{
+				sys_log.warning("CPU Thread '%s' terminated abnormally:\n%s", name, _this->dump_all());
+				cleanup();
+			}
+		}
+	} cleanup{this, array_slot};
 
 	// Check thread status
 	while (!(state & (cpu_flag::exit + cpu_flag::dbg_global_stop)) && thread_ctrl::state() != thread_state::aborting)
@@ -355,18 +433,7 @@ void cpu_thread::operator()()
 		// Check stop status
 		if (!(state & cpu_flag::stop))
 		{
-			try
-			{
-				cpu_task();
-			}
-			catch (const std::exception& e)
-			{
-				Emu.Pause();
-				sys_log.fatal("%s thrown: %s", typeid(e).name(), e.what());
-				sys_log.notice("\n%s", dump());
-				break;
-			}
-
+			cpu_task();
 			state -= cpu_flag::ret;
 			continue;
 		}
@@ -374,17 +441,8 @@ void cpu_thread::operator()()
 		thread_ctrl::wait();
 	}
 
-	if (auto ptr = vm::g_tls_locked)
-	{
-		ptr->compare_and_swap(this, nullptr);
-	}
-
-	// Unregister and wait if necessary
-	state += cpu_flag::wait;
-	verify("g_cpu_array[...] -> null" HERE), g_cpu_array[array_slot].exchange(nullptr) == this;
-	g_cpu_array_bits[array_slot / 64] &= ~(1ull << (array_slot % 64));
-	g_cpu_array_sema--;
-	g_cpu_suspend_lock.lock_unlock();
+	// Complete cleanup gracefully
+	cleanup.cleanup();
 }
 
 cpu_thread::~cpu_thread()
@@ -479,7 +537,7 @@ bool cpu_thread::check_state() noexcept
 		else
 		{
 			// If only cpu_flag::pause was set, notification won't arrive
-			g_cpu_suspend_lock.lock_unlock();
+			g_fxo->get<cpu_counter>()->cpu_suspend_lock.lock_unlock();
 		}
 	}
 
@@ -550,7 +608,27 @@ std::string cpu_thread::get_name() const
 	}
 }
 
-std::string cpu_thread::dump() const
+std::string cpu_thread::dump_all() const
+{
+	return {};
+}
+
+std::string cpu_thread::dump_regs() const
+{
+	return {};
+}
+
+std::string cpu_thread::dump_callstack() const
+{
+	return {};
+}
+
+std::vector<u32> cpu_thread::dump_callstack_list() const
+{
+	return {};
+}
+
+std::string cpu_thread::dump_misc() const
 {
 	return fmt::format("Type: %s\n" "State: %s\n", typeid(*this).name(), state.load());
 }
@@ -563,11 +641,14 @@ cpu_thread::suspend_all::suspend_all(cpu_thread* _this) noexcept
 		m_this->state += cpu_flag::wait;
 	}
 
-	g_cpu_suspend_lock.lock_vip();
+	g_fxo->get<cpu_counter>()->cpu_suspend_lock.lock_vip();
 
 	for_all_cpu([](cpu_thread* cpu)
 	{
-		cpu->state += cpu_flag::pause;
+		if (!(cpu->state & cpu_flag::pause))
+		{
+			cpu->state += cpu_flag::pause;
+		}
 	});
 
 	busy_wait(500);
@@ -596,18 +677,18 @@ cpu_thread::suspend_all::suspend_all(cpu_thread* _this) noexcept
 cpu_thread::suspend_all::~suspend_all()
 {
 	// Make sure the latest thread does the cleanup and notifies others
-	if (g_cpu_suspend_lock.downgrade_unique_vip_lock_to_low_or_unlock())
+	if (g_fxo->get<cpu_counter>()->cpu_suspend_lock.downgrade_unique_vip_lock_to_low_or_unlock())
 	{
 		for_all_cpu([&](cpu_thread* cpu)
 		{
 			cpu->state -= cpu_flag::pause;
 		});
 
-		g_cpu_suspend_lock.unlock_low();
+		g_fxo->get<cpu_counter>()->cpu_suspend_lock.unlock_low();
 	}
 	else
 	{
-		g_cpu_suspend_lock.lock_unlock();
+		g_fxo->get<cpu_counter>()->cpu_suspend_lock.lock_unlock();
 	}
 
 	if (m_this)
@@ -626,7 +707,7 @@ void cpu_thread::stop_all() noexcept
 	}
 	else
 	{
-		::vip_lock lock(g_cpu_suspend_lock);
+		::vip_lock lock(g_fxo->get<cpu_counter>()->cpu_suspend_lock);
 
 		for_all_cpu([](cpu_thread* cpu)
 		{
@@ -637,7 +718,7 @@ void cpu_thread::stop_all() noexcept
 
 	sys_log.notice("All CPU threads have been signaled.");
 
-	while (g_cpu_array_sema)
+	while (g_fxo->get<cpu_counter>()->cpu_array_sema)
 	{
 		std::this_thread::sleep_for(10ms);
 	}

rpcs3/Emu/CPU/CPUThread.h

@@ -1,8 +1,10 @@
-#pragma once
+#pragma once
 
 #include "../Utilities/Thread.h"
 #include "../Utilities/bit_set.h"
 
+#include <vector>
+
 // Thread state flags
 enum class cpu_flag : u32
 {
@@ -91,8 +93,20 @@ public:
 	// Get thread name (as assigned to named_thread)
 	std::string get_name() const;
 
-	// Get CPU state dump
-	virtual std::string dump() const;
+	// Get CPU state dump (everything)
+	virtual std::string dump_all() const = 0;
+
+	// Get CPU register dump
+	virtual std::string dump_regs() const;
+
+	// Get CPU call stack dump
+	virtual std::string dump_callstack() const;
+
+	// Get CPU call stack list
+	virtual std::vector<u32> dump_callstack_list() const;
+
+	// Get CPU dump of misc information
+	virtual std::string dump_misc() const;
 
 	// Thread entry point function
 	virtual void cpu_task() = 0;

rpcs3/Emu/CPU/CPUTranslator.cpp

@@ -1,4 +1,4 @@
-#ifdef LLVM_AVAILABLE
+#ifdef LLVM_AVAILABLE
 
 #include "CPUTranslator.h"
 
@@ -117,21 +117,21 @@ v128 cpu_translator::get_const_vector<v128>(llvm::Constant* c, u32 a, u32 b)
 	{
 		for (u32 i = 0; i < 16; i++)
 		{
-			result._u8[i] = cv->getElementAsInteger(i);
+			result._u8[i] = static_cast<u8>(cv->getElementAsInteger(i));
 		}
 	}
 	else if (sct->isIntegerTy(16))
 	{
 		for (u32 i = 0; i < 8; i++)
 		{
-			result._u16[i] = cv->getElementAsInteger(i);
+			result._u16[i] = static_cast<u16>(cv->getElementAsInteger(i));
 		}
 	}
 	else if (sct->isIntegerTy(32))
 	{
 		for (u32 i = 0; i < 4; i++)
 		{
-			result._u32[i] = cv->getElementAsInteger(i);
+			result._u32[i] = static_cast<u32>(cv->getElementAsInteger(i));
 		}
 	}
 	else if (sct->isIntegerTy(64))

rpcs3/Emu/CPU/CPUTranslator.h

@@ -16,6 +16,7 @@
 #include "llvm/IR/Module.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Analysis/ConstantFolding.h"
+#include "llvm/IR/IntrinsicsX86.h"
 #ifdef _MSC_VER
 #pragma warning(pop)
 #else
@@ -27,7 +28,7 @@
 #include "Utilities/StrFmt.h"
 #include "Utilities/BEType.h"
 #include "Utilities/BitField.h"
-#include "Utilities/Log.h"
+#include "util/logs.hpp"
 #include "Utilities/JIT.h"
 
 #include <unordered_map>
@@ -2841,6 +2842,17 @@ struct fmt_unveil<llvm::TypeSize, void>
 	}
 };
 
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-attributes"
+#endif
+
+template <>
+inline llvm::Type* cpu_translator::get_type<__m128i>()
+{
+	return llvm::VectorType::get(llvm::Type::getInt8Ty(m_context), 16);
+}
+
 #ifndef _MSC_VER
 #pragma GCC diagnostic pop
 #endif

rpcs3/Emu/Cell/MFC.cpp

@@ -62,5 +62,7 @@ void fmt_class_string<spu_mfc_cmd>::format(std::string& out, u64 arg)
 {
 	const auto& cmd = get_object(arg);
 
-	fmt::append(out, "%s #%02u 0x%05x:0x%08x 0x%x", cmd.cmd, cmd.tag, cmd.lsa, cmd.eah * 0x100000000ull + cmd.eal, cmd.size);
+	const u8 tag = cmd.tag;
+
+	fmt::append(out, "%s #%02u 0x%05x:0x%08llx 0x%x%s", cmd.cmd, tag & 0x7f, cmd.lsa, u64{cmd.eah} << 32 | cmd.eal, cmd.size, (tag & 0x80) ? " (stalled)" : "");
 }

rpcs3/Emu/Cell/Modules/StaticHLE.cpp

@@ -80,7 +80,7 @@ bool statichle_handler::load_patterns()
 		for (u32 j = 0; j < 32; j++)
 			dapat.start_pattern[j] = char_to_u8(pattern[0][j * 2], pattern[0][(j * 2) + 1]);
 
-		dapat.crc16_length = char_to_u8(pattern[1][0], pattern[1][1]);
+		dapat.crc16_length = ::narrow<u8>(char_to_u8(pattern[1][0], pattern[1][1]), HERE);
 		dapat.crc16        = (char_to_u8(pattern[2][0], pattern[2][1]) << 8) | char_to_u8(pattern[2][2], pattern[2][3]);
 		dapat.total_length = (char_to_u8(pattern[3][0], pattern[3][1]) << 8) | char_to_u8(pattern[3][2], pattern[3][3]);
 		dapat.module       = pattern[4];

rpcs3/Emu/Cell/Modules/cellAdec.cpp

@@ -833,7 +833,12 @@ error_code cellAdecClose(u32 handle)
 		thread_ctrl::wait_for(1000); // hack
 	}
 
-	idm::remove<ppu_thread>(handle);
+	if (!idm::remove_verify<ppu_thread>(handle, std::move(adec)))
+	{
+		// Removed by other thread beforehead
+		return CELL_ADEC_ERROR_ARG;
+	}
+
 	return CELL_OK;
 }
 

rpcs3/Emu/Cell/Modules/cellAudioOut.cpp

@@ -26,6 +26,8 @@ void fmt_class_string<CellAudioOutError>::format(std::string& out, u64 arg)
 	});
 }
 
+error_code cellAudioOutGetNumberOfDevice(u32 audioOut);
+
 error_code cellAudioOutGetSoundAvailability(u32 audioOut, u32 type, u32 fs, u32 option)
 {
 	cellSysutil.warning("cellAudioOutGetSoundAvailability(audioOut=%d, type=%d, fs=0x%x, option=%d)", audioOut, type, fs, option);
@@ -122,29 +124,55 @@ error_code cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudio
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	*state = {};
+
+	const auto num = cellAudioOutGetNumberOfDevice(audioOut);
+
+	if (num < 0)
+	{
+		return num;
+	}
+
+	CellAudioOutState _state;
+	std::memset(&_state, 0, sizeof(_state));
+
+	if (deviceIndex >= num + 0u)
+	{
+		if (audioOut == CELL_AUDIO_OUT_SECONDARY)
+		{
+			// Error codes are not returned here
+			// Random (uninitialized) data from the stack seems to be returned here
+			// Although it was constant on my tests so let's write that
+			_state.state = 0x10;
+			_state.soundMode.layout = 0xD00C1680;
+			std::memcpy(state.get_ptr(), &_state, state.size());
+			return CELL_OK;
+		}
+
+		return CELL_AUDIO_OUT_ERROR_PARAMETER_OUT_OF_RANGE;
+	}
 
 	switch (audioOut)
 	{
 	case CELL_AUDIO_OUT_PRIMARY:
-		state->state = CELL_AUDIO_OUT_OUTPUT_STATE_ENABLED;
-		state->encoder = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
-		state->downMixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
-		state->soundMode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
-		state->soundMode.channel = CELL_AUDIO_OUT_CHNUM_8;
-		state->soundMode.fs = CELL_AUDIO_OUT_FS_48KHZ;
-		state->soundMode.reserved = 0;
-		state->soundMode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy;
-
-		return CELL_OK;
-
 	case CELL_AUDIO_OUT_SECONDARY:
-		state->state = CELL_AUDIO_OUT_OUTPUT_STATE_DISABLED;
-
-		return CELL_OK;
+	{
+		_state.state = CELL_AUDIO_OUT_OUTPUT_STATE_ENABLED;
+		_state.encoder = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
+		_state.downMixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
+		_state.soundMode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
+		_state.soundMode.channel = CELL_AUDIO_OUT_CHNUM_8;
+		_state.soundMode.fs = CELL_AUDIO_OUT_FS_48KHZ;
+		_state.soundMode.reserved = 0;
+		_state.soundMode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy;
+		break;
 	}
 
-	return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	default:
+		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
+	}
+
+	std::memcpy(state.get_ptr(), &_state, state.size());
+	return CELL_OK;
 }
 
 error_code cellAudioOutConfigure(u32 audioOut, vm::ptr<CellAudioOutConfiguration> config, vm::ptr<CellAudioOutOption> option, u32 waitForEvent)
@@ -159,6 +187,7 @@ error_code cellAudioOutConfigure(u32 audioOut, vm::ptr<CellAudioOutConfiguration
 	switch (audioOut)
 	{
 	case CELL_AUDIO_OUT_PRIMARY:
+	{
 		if (config->channel)
 		{
 			//Emu.GetAudioManager().GetInfo().mode.channel = config->channel;
@@ -172,12 +201,14 @@ error_code cellAudioOutConfigure(u32 audioOut, vm::ptr<CellAudioOutConfiguration
 		}
 
 		return CELL_OK;
-
-	case CELL_AUDIO_OUT_SECONDARY:
-		return CELL_OK;
 	}
 
-	return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	case CELL_AUDIO_OUT_SECONDARY:
+		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	default: break;
+	}
+
+	return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 }
 
 error_code cellAudioOutGetConfiguration(u32 audioOut, vm::ptr<CellAudioOutConfiguration> config, vm::ptr<CellAudioOutOption> option)
@@ -189,30 +220,27 @@ error_code cellAudioOutGetConfiguration(u32 audioOut, vm::ptr<CellAudioOutConfig
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	if (option)
-	{
-		*option = {};
-	}
-
-	*config = {};
+	CellAudioOutConfiguration _config;
+	std::memset(&_config, 0, sizeof(_config));
 
 	switch (audioOut)
 	{
 	case CELL_AUDIO_OUT_PRIMARY:
-		config->channel = CELL_AUDIO_OUT_CHNUM_8;
-		config->encoder = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
-		config->downMixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
-
-		return CELL_OK;
-
-	case CELL_AUDIO_OUT_SECONDARY:
-
-		return CELL_OK;
-	default:
+	{
+		_config.channel = CELL_AUDIO_OUT_CHNUM_8;
+		_config.encoder = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
+		_config.downMixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
 		break;
 	}
 
-	return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	case CELL_AUDIO_OUT_SECONDARY:
+		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	default:
+		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
+	}
+
+	std::memcpy(config.get_ptr(), &_config, config.size());
+	return CELL_OK;
 }
 
 error_code cellAudioOutGetNumberOfDevice(u32 audioOut)
@@ -229,7 +257,7 @@ error_code cellAudioOutGetNumberOfDevice(u32 audioOut)
 		break;
 	}
 
-	return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 }
 
 error_code cellAudioOutGetDeviceInfo(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudioOutDeviceInfo> info)
@@ -241,24 +269,42 @@ error_code cellAudioOutGetDeviceInfo(u32 audioOut, u32 deviceIndex, vm::ptr<Cell
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	if (deviceIndex)
+	const auto num = cellAudioOutGetNumberOfDevice(audioOut);
+
+	if (num < 0)
 	{
-		return CELL_AUDIO_OUT_ERROR_DEVICE_NOT_FOUND;
+		return num;
 	}
 
-	info->portType = CELL_AUDIO_OUT_PORT_HDMI;
-	info->availableModeCount = 2;
-	info->state = CELL_AUDIO_OUT_DEVICE_STATE_AVAILABLE;
-	info->latency = 1000;
-	info->availableModes[0].type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
-	info->availableModes[0].channel = CELL_AUDIO_OUT_CHNUM_8;
-	info->availableModes[0].fs = CELL_AUDIO_OUT_FS_48KHZ;
-	info->availableModes[0].layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy;
-	info->availableModes[1].type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
-	info->availableModes[1].channel = CELL_AUDIO_OUT_CHNUM_2;
-	info->availableModes[1].fs = CELL_AUDIO_OUT_FS_48KHZ;
-	info->availableModes[1].layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH;
+	if (deviceIndex >= num + 0u)
+	{
+		if (audioOut == CELL_AUDIO_OUT_SECONDARY)
+		{
+			// Error codes are not returned here
+			std::memset(info.get_ptr(), 0, info.size());
+			return CELL_OK;
+		}
 
+		return CELL_AUDIO_OUT_ERROR_PARAMETER_OUT_OF_RANGE;
+	}
+
+	CellAudioOutDeviceInfo _info;
+	std::memset(&_info, 0, sizeof(_info));
+
+	_info.portType = CELL_AUDIO_OUT_PORT_HDMI;
+	_info.availableModeCount = 2;
+	_info.state = CELL_AUDIO_OUT_DEVICE_STATE_AVAILABLE;
+	_info.latency = 1000;
+	_info.availableModes[0].type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
+	_info.availableModes[0].channel = CELL_AUDIO_OUT_CHNUM_8;
+	_info.availableModes[0].fs = CELL_AUDIO_OUT_FS_48KHZ;
+	_info.availableModes[0].layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy;
+	_info.availableModes[1].type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
+	_info.availableModes[1].channel = CELL_AUDIO_OUT_CHNUM_2;
+	_info.availableModes[1].fs = CELL_AUDIO_OUT_FS_48KHZ;
+	_info.availableModes[1].layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH;
+
+	std::memcpy(info.get_ptr(), &_info, info.size());
 	return CELL_OK;
 }
 
@@ -274,10 +320,11 @@ error_code cellAudioOutSetCopyControl(u32 audioOut, u32 control)
 	switch (audioOut)
 	{
 	case CELL_AUDIO_OUT_PRIMARY:
-	case CELL_AUDIO_OUT_SECONDARY:
 		break;
-	default:
+	case CELL_AUDIO_OUT_SECONDARY:
 		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	default:
+		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
 	return CELL_OK;

rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp

@@ -300,6 +300,14 @@ error_code cellVideoOutGetScreenSize(u32 videoOut, vm::ptr<f32> screenSize)
 		return CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT;
 	}
 
+	if (g_cfg.video.enable_3d)
+	{
+		// Return Playstation 3D display value
+		// Some games call this function when 3D is enabled
+		*screenSize = 24.f;
+		return CELL_OK;
+	}
+
 	//	TODO: Use virtual screen size
 #ifdef _WIN32
 	//	HDC screen = GetDC(NULL);

rpcs3/Emu/Cell/Modules/cellCamera.cpp

@@ -44,38 +44,6 @@ error_code cellCameraReadEx(s32 dev_num, vm::ptr<CellCameraReadEx> read);
 // * HLE helper functions *
 // ************************
 
-template <>
-void fmt_class_string<camera_handler>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case camera_handler::null: return "Null";
-		case camera_handler::fake: return "Fake";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<fake_camera_type>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case fake_camera_type::unknown: return "Unknown";
-		case fake_camera_type::eyetoy: return "EyeToy";
-		case fake_camera_type::eyetoy2: return "PS Eye";
-		case fake_camera_type::uvc1_1: return "UVC 1.1";
-		}
-
-		return unknown;
-	});
-}
-
 static const char* get_camera_attr_name(s32 value)
 {
 	switch (value)

rpcs3/Emu/Cell/Modules/cellFs.cpp

@@ -863,12 +863,6 @@ s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr<void(s32 xfd, u64 xsize)>
 
 using fs_aio_cb_t = vm::ptr<void(vm::ptr<CellFsAio> xaio, s32 error, s32 xid, u64 size)>;
 
-// temporarily
-struct lv2_fs_mount_point
-{
-	std::mutex mutex;
-};
-
 struct fs_aio_thread : ppu_thread
 {
 	using ppu_thread::ppu_thread;

rpcs3/Emu/Cell/Modules/cellGame.cpp

@@ -10,6 +10,7 @@
 
 #include "Loader/PSF.h"
 #include "Utilities/StrUtil.h"
+#include "Utilities/span.h"
 #include "util/init_mutex.hpp"
 
 #include <thread>
@@ -137,15 +138,9 @@ struct content_permission final
 		bool success = false;
 		fs::g_tls_error = fs::error::ok;
 
-		try
-		{
-			if (temp.size() <= 1 || fs::remove_all(temp))
-			{
-				success = true;
-			}
-		}
-		catch (...)
+		if (temp.size() <= 1 || fs::remove_all(temp))
 		{
+			success = true;
 		}
 
 		if (!success)
@@ -483,13 +478,14 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
 		perm->can_create = true;
 	}
 
+	perm->restrict_sfo_params = false;
+
 	if (!fs::is_dir(vfs::get(dir)))
 	{
 		cellGame.warning("cellGameDataCheck(): directory '%s' not found", dir);
 		return not_an_error(CELL_GAME_RET_NONE);
 	}
 
-	perm->restrict_sfo_params = false;
 	perm->sfo = psf::load_object(fs::file(vfs::get(dir + "/PARAM.SFO")));
 	return CELL_OK;
 }
@@ -569,9 +565,13 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 
 	const u32 new_data = sfo.empty() && !fs::is_file(vfs::get(dir + "/PARAM.SFO")) ? CELL_GAMEDATA_ISNEWDATA_YES : CELL_GAMEDATA_ISNEWDATA_NO;
 
-	if (!new_data && psf::get_string(sfo, "CATEGORY", "") != "GD")
+	if (!new_data)
 	{
-		return CELL_GAMEDATA_ERROR_BROKEN;
+		const auto cat = psf::get_string(sfo, "CATEGORY", "");
+		if (cat != "GD" && cat != "DG")
+		{
+			return CELL_GAMEDATA_ERROR_BROKEN;
+		}
 	}
 
 	cbGet->isNewData = new_data;
@@ -632,7 +632,11 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 
 		if (setParam)
 		{
-			psf::assign(sfo, "CATEGORY", psf::string(3, "GD"));
+			if (new_data)
+			{
+				psf::assign(sfo, "CATEGORY", psf::string(3, "GD"));
+			}
+
 			psf::assign(sfo, "TITLE_ID", psf::string(CELL_GAME_SYSP_TITLEID_SIZE, setParam->titleId));
 			psf::assign(sfo, "TITLE", psf::string(CELL_GAME_SYSP_TITLE_SIZE, setParam->title));
 			psf::assign(sfo, "VERSION", psf::string(CELL_GAME_SYSP_VERSION_SIZE, setParam->dataVersion));
@@ -873,7 +877,6 @@ error_code cellGameGetParamString(s32 id, vm::ptr<char> buf, u32 bufsize)
 	}
 
 	const std::string value = psf::get_string(prm->sfo, std::string(key.name));
-	const auto value_size = value.size() + 1;
 
 	if (value.empty() && !prm->sfo.count(std::string(key.name)))
 	{
@@ -881,15 +884,8 @@ error_code cellGameGetParamString(s32 id, vm::ptr<char> buf, u32 bufsize)
 		cellGame.warning("cellGameGetParamString(): id=%d was not found", id);
 	}
 
-	const auto pbuf = buf.get_ptr();
-	const bool to_pad = bufsize > value_size;
-	std::memcpy(pbuf, value.c_str(), to_pad ? value_size : bufsize);
-
-	if (to_pad)
-	{
-		std::memset(pbuf + value_size, 0, bufsize - value_size);
-	}
-
+	gsl::span dst(buf.get_ptr(), bufsize);
+	strcpy_trunc(dst, value);
 	return CELL_OK;
 }
 

rpcs3/Emu/Cell/Modules/cellGcmSys.cpp

@@ -266,7 +266,7 @@ error_code cellGcmBindTile(u8 index)
 		return CELL_GCM_ERROR_INVALID_VALUE;
 	}
 
-	rsx::get_current_renderer()->tiles[index].binded = true;
+	rsx::get_current_renderer()->tiles[index].bound = true;
 
 	return CELL_OK;
 }
@@ -281,7 +281,7 @@ error_code cellGcmBindZcull(u8 index, u32 offset, u32 width, u32 height, u32 cul
 		return CELL_GCM_ERROR_INVALID_VALUE;
 	}
 
-	rsx::get_current_renderer()->zculls[index].binded = true;
+	rsx::get_current_renderer()->zculls[index].bound = true;
 
 	return CELL_OK;
 }
@@ -586,7 +586,6 @@ void cellGcmSetSecondVFrequency(u32 freq)
 	switch (freq)
 	{
 	case CELL_GCM_DISPLAY_FREQUENCY_59_94HZ:
-		render->fps_limit = 59.94;
 		break;
 	case CELL_GCM_DISPLAY_FREQUENCY_SCANOUT:
 		cellGcmSys.todo("Unimplemented display frequency: Scanout");
@@ -702,7 +701,7 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
 	zcull.sFunc = sFunc;
 	zcull.sRef = sRef;
 	zcull.sMask = sMask;
-	zcull.binded = (zCullFormat > 0);
+	zcull.bound = (zCullFormat > 0);
 
 	vm::_ptr<CellGcmZcullInfo>(gcm_cfg->zculls_addr)[index] = zcull.pack();
 }
@@ -716,7 +715,7 @@ error_code cellGcmUnbindTile(u8 index)
 		return CELL_GCM_ERROR_INVALID_VALUE;
 	}
 
-	rsx::get_current_renderer()->tiles[index].binded = false;
+	rsx::get_current_renderer()->tiles[index].bound = false;
 
 	return CELL_OK;
 }
@@ -730,7 +729,7 @@ error_code cellGcmUnbindZcull(u8 index)
 		return CELL_GCM_ERROR_INVALID_VALUE;
 	}
 
-	rsx::get_current_renderer()->zculls[index].binded = false;
+	rsx::get_current_renderer()->zculls[index].bound = false;
 
 	return CELL_OK;
 }
@@ -1302,7 +1301,7 @@ error_code cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch
 	tile.comp = comp;
 	tile.base = base;
 	tile.bank = bank;
-	tile.binded = (pitch > 0);
+	tile.bound = (pitch > 0);
 
 	vm::_ptr<CellGcmTileInfo>(gcm_cfg->tiles_addr)[index] = tile.pack();
 	return CELL_OK;

rpcs3/Emu/Cell/Modules/cellGem.cpp

@@ -136,26 +136,6 @@ struct gem_config
 	}
 };
 
-// ************************
-// * HLE helper functions *
-// ************************
-
-template <>
-void fmt_class_string<move_handler>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case move_handler::null: return "Null";
-		case move_handler::fake: return "Fake";
-		case move_handler::mouse: return "Mouse";
-		}
-
-		return unknown;
-	});
-}
-
 /**
  * \brief Verifies that a Move controller id is valid
  * \param gem_num Move controler ID to verify
@@ -295,7 +275,7 @@ static bool ds3_input_to_ext(const u32 port_no, CellGemExtPortData& ext)
  * \param mouse_no Mouse index number to use
  * \param digital_buttons Bitmask filled with CELL_GEM_CTRL_* values
  * \param analog_t Analog value of Move's Trigger.
- * \return true on success, false if mouse mouse_no is invalid
+ * \return true on success, false if mouse_no is invalid
  */
 static bool mouse_input_to_pad(const u32 mouse_no, be_t<u16>& digital_buttons, be_t<u16>& analog_t)
 {
@@ -325,7 +305,7 @@ static bool mouse_input_to_pad(const u32 mouse_no, be_t<u16>& digital_buttons, b
 	if ((mouse_data.buttons & CELL_MOUSE_BUTTON_2) && (mouse_data.buttons & CELL_MOUSE_BUTTON_3))
 		digital_buttons |= CELL_GEM_CTRL_TRIANGLE;
 
-	analog_t = mouse_data.buttons & (CELL_MOUSE_BUTTON_1 ? 0xFFFF : 0);
+	analog_t = (mouse_data.buttons & CELL_MOUSE_BUTTON_1) ? 0xFFFF : 0;
 
 	return true;
 }
@@ -713,7 +693,9 @@ error_code cellGemGetImageState(u32 gem_num, vm::ptr<CellGemImageState> gem_imag
 		gem_image_state->projectiony = 1;
 	}
 	else if (g_cfg.io.move == move_handler::mouse)
+	{
 		mouse_pos_to_gem_image_state(gem_num, gem_image_state);
+	}
 
 	if (g_cfg.io.move == move_handler::fake || g_cfg.io.move == move_handler::mouse)
 	{
@@ -747,9 +729,13 @@ error_code cellGemGetInertialState(u32 gem_num, u32 state_flag, u64 timestamp, v
 	}
 
 	if (g_cfg.io.move == move_handler::fake)
+	{
 		ds3_input_to_pad(gem_num, inertial_state->pad.digitalbuttons, inertial_state->pad.analog_T);
+	}
 	else if (g_cfg.io.move == move_handler::mouse)
+	{
 		mouse_input_to_pad(gem_num, inertial_state->pad.digitalbuttons, inertial_state->pad.analog_T);
+	}
 
 	if (g_cfg.io.move == move_handler::fake || g_cfg.io.move == move_handler::mouse)
 	{
@@ -879,7 +865,9 @@ error_code cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<Ce
 	}
 
 	if (g_cfg.io.move == move_handler::fake)
+	{
 		ds3_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T);
+	}
 	else if (g_cfg.io.move == move_handler::mouse)
 	{
 		mouse_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T);

rpcs3/Emu/Cell/Modules/cellImeJp.cpp

@@ -56,7 +56,7 @@ bool ime_jp_manager::addString(vm::cptr<u16> str)
 	if (!str)
 		return false;
 
-	for (size_t i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
 	{
 		if (!addChar(str[i]))
 			return false;
@@ -111,7 +111,7 @@ void ime_jp_manager::moveCursorEnd(s8 amount)
 {
 	if (amount > 0)
 	{
-		cursor_end = std::max(static_cast<s32>(cursor), std::min<s32>(cursor_end + amount, input_string.length() - 1));
+		cursor_end = std::max(static_cast<s32>(cursor), std::min<s32>(static_cast<s32>(cursor_end) + amount, ::narrow<s32>(input_string.length()) - 1));
 	}
 	else if (amount < 0)
 	{
@@ -199,7 +199,7 @@ error_code cellImeJpOpen3(sys_memory_container_t container_id, vm::ptr<CellImeJp
 
 	if (addDicPath)
 	{
-		for (size_t i = 0; i < 4; i++)
+		for (u32 i = 0; i < 4; i++)
 		{
 			if (addDicPath[i] && addDicPath[i]->path[0])
 			{
@@ -798,10 +798,10 @@ error_code cellImeJpMoveFocusClause(CellImeJpHandle hImeJpHandle, s16 moveType)
 		manager->moveCursor(-1);
 		break;
 	case CELL_IMEJP_FOCUS_TOP:
-		manager->moveCursor((-1) * manager->input_string.length());
+		manager->moveCursor(-1 * ::narrow<s8>(manager->input_string.length(), HERE));
 		break;
 	case CELL_IMEJP_FOCUS_END:
-		manager->moveCursor(manager->input_string.length());
+		manager->moveCursor(::narrow<s8>(manager->input_string.length(), HERE));
 		manager->moveCursor(-1);
 		break;
 	default:
@@ -830,7 +830,7 @@ error_code cellImeJpGetFocusTop(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pFocu
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	*pFocusTop = manager->cursor * 2; // offset in bytes
+	*pFocusTop = static_cast<u16>(manager->cursor * 2); // offset in bytes
 
 	return CELL_OK;
 }
@@ -858,7 +858,7 @@ error_code cellImeJpGetFocusLength(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pF
 	}
 	else
 	{
-		*pFocusLength = (manager->cursor_end - manager->cursor + 1) * 2; // offset in bytes
+		*pFocusLength = static_cast<u16>((manager->cursor_end - manager->cursor + 1) * 2); // offset in bytes
 	}
 
 	return CELL_OK;
@@ -881,14 +881,14 @@ error_code cellImeJpGetConfirmYomiString(CellImeJpHandle hImeJpHandle, vm::ptr<u
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	for (size_t i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
 	{
 		pYomiString[i] = 0;
 	}
 
 	const size_t max_len = std::min<size_t>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager->confirmed_string.length());
 
-	for (size_t i = 0; i < max_len; i++)
+	for (u32 i = 0; i < max_len; i++)
 	{
 		pYomiString[i] = manager->confirmed_string[i];
 	}
@@ -913,14 +913,14 @@ error_code cellImeJpGetConfirmString(CellImeJpHandle hImeJpHandle, vm::ptr<u16>
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	for (size_t i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
 	{
 		pConfirmString[i] = 0;
 	}
 
 	const size_t max_len = std::min<size_t>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager->confirmed_string.length());
 
-	for (size_t i = 0; i < max_len; i++)
+	for (u32 i = 0; i < max_len; i++)
 	{
 		pConfirmString[i] = manager->confirmed_string[i];
 	}
@@ -945,14 +945,14 @@ error_code cellImeJpGetConvertYomiString(CellImeJpHandle hImeJpHandle, vm::ptr<u
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	for (size_t i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
 	{
 		pYomiString[i] = 0;
 	}
 
 	const size_t max_len = std::min<size_t>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager->input_string.length());
 
-	for (size_t i = 0; i < max_len; i++)
+	for (u32 i = 0; i < max_len; i++)
 	{
 		pYomiString[i] = manager->input_string[i];
 	}
@@ -977,14 +977,14 @@ error_code cellImeJpGetConvertString(CellImeJpHandle hImeJpHandle, vm::ptr<u16>
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	for (size_t i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
 	{
 		pConvertString[i] = 0;
 	}
 
 	const size_t max_len = std::min<size_t>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager->input_string.length());
 
-	for (size_t i = 0; i < max_len; i++)
+	for (u32 i = 0; i < max_len; i++)
 	{
 		pConvertString[i] = manager->input_string[i];
 	}

rpcs3/Emu/Cell/Modules/cellMic.cpp

@@ -10,23 +10,6 @@
 
 LOG_CHANNEL(cellMic);
 
-template <>
-void fmt_class_string<microphone_handler>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value) {
-		switch (value)
-		{
-		case microphone_handler::null: return "Null";
-		case microphone_handler::standard: return "Standard";
-		case microphone_handler::singstar: return "SingStar";
-		case microphone_handler::real_singstar: return "Real SingStar";
-		case microphone_handler::rocksmith: return "Rocksmith";
-		}
-
-		return unknown;
-	});
-}
-
 void mic_context::operator()()
 {
 	while (thread_ctrl::state() != thread_state::aborting)

rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp

@@ -116,7 +116,7 @@ struct msg_dlg_thread_info
 						continue;
 					}
 
-					dlg->close();
+					dlg->close(true, true);
 				}
 			}
 			else if (const auto dlg = g_fxo->get<msg_info>()->get())
@@ -463,7 +463,7 @@ error_code cellMsgDialogAbort()
 		if (auto dlg = manager->get<rsx::overlays::message_dialog>())
 		{
 			g_fxo->get<msg_dlg_thread>()->wait_until = 0;
-			dlg->close(false);
+			dlg->close(false, true);
 			return CELL_OK;
 		}
 	}

rpcs3/Emu/Cell/Modules/cellNetCtl.cpp

@@ -2,12 +2,18 @@
 #include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
+#include "Emu/Cell/lv2/sys_sync.h"
 
 #include "cellGame.h"
 #include "cellSysutil.h"
 #include "cellNetCtl.h"
 
 #include "Utilities/StrUtil.h"
+#include "Emu/IdManager.h"
+
+#include "Emu/NP/np_handler.h"
+
+#include <thread>
 
 LOG_CHANNEL(cellNetCtl);
 
@@ -90,14 +96,14 @@ error_code cellNetCtlInit()
 {
 	cellNetCtl.warning("cellNetCtlInit()");
 
-	auto net_ctl_manager = g_fxo->get<cell_net_ctl_manager>();
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
 
-	if (net_ctl_manager->is_initialized)
+	if (nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_TERMINATED;
 	}
 
-	net_ctl_manager->is_initialized = true;
+	nph->is_netctl_init = true;
 
 	return CELL_OK;
 }
@@ -106,15 +112,17 @@ void cellNetCtlTerm()
 {
 	cellNetCtl.warning("cellNetCtlTerm()");
 
-	auto net_ctl_manager = g_fxo->get<cell_net_ctl_manager>();
-	net_ctl_manager->is_initialized = false;
+	const auto nph      = g_fxo->get<named_thread<np_handler>>();
+	nph->is_netctl_init = false;
 }
 
 error_code cellNetCtlGetState(vm::ptr<s32> state)
 {
 	cellNetCtl.trace("cellNetCtlGetState(state=*0x%x)", state);
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}
@@ -124,7 +132,8 @@ error_code cellNetCtlGetState(vm::ptr<s32> state)
 		return CELL_NET_CTL_ERROR_INVALID_ADDR;
 	}
 
-	*state = g_cfg.net.net_status;
+	*state = nph->get_net_status();
+
 	return CELL_OK;
 }
 
@@ -132,7 +141,9 @@ error_code cellNetCtlAddHandler(vm::ptr<cellNetCtlHandler> handler, vm::ptr<void
 {
 	cellNetCtl.todo("cellNetCtlAddHandler(handler=*0x%x, arg=*0x%x, hid=*0x%x)", handler, arg, hid);
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}
@@ -149,7 +160,9 @@ error_code cellNetCtlDelHandler(s32 hid)
 {
 	cellNetCtl.todo("cellNetCtlDelHandler(hid=0x%x)", hid);
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}
@@ -166,7 +179,9 @@ error_code cellNetCtlGetInfo(s32 code, vm::ptr<CellNetCtlInfo> info)
 {
 	cellNetCtl.todo("cellNetCtlGetInfo(code=0x%x (%s), info=*0x%x)", code, InfoCodeToName(code), info);
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}
@@ -183,7 +198,7 @@ error_code cellNetCtlGetInfo(s32 code, vm::ptr<CellNetCtlInfo> info)
 		return CELL_OK;
 	}
 
-	if (g_cfg.net.net_status == CELL_NET_CTL_STATE_Disconnected)
+	if (nph->get_net_status() == CELL_NET_CTL_STATE_Disconnected)
 	{
 		return CELL_NET_CTL_ERROR_NOT_CONNECTED;
 	}
@@ -198,15 +213,7 @@ error_code cellNetCtlGetInfo(s32 code, vm::ptr<CellNetCtlInfo> info)
 	}
 	else if (code == CELL_NET_CTL_INFO_IP_ADDRESS)
 	{
-		if (g_cfg.net.net_status != CELL_NET_CTL_STATE_IPObtained)
-		{
-			// 0.0.0.0 seems to be the default address when no ethernet cables are connected to the PS3
-			strcpy_trunc(info->ip_address, "0.0.0.0");
-		}
-		else
-		{
-			strcpy_trunc(info->ip_address, g_cfg.net.ip_address);
-		}
+		strcpy_trunc(info->ip_address, nph->get_ip());
 	}
 	else if (code == CELL_NET_CTL_INFO_NETMASK)
 	{
@@ -224,7 +231,9 @@ error_code cellNetCtlNetStartDialogLoadAsync(vm::cptr<CellNetCtlNetStartDialogPa
 {
 	cellNetCtl.error("cellNetCtlNetStartDialogLoadAsync(param=*0x%x)", param);
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}
@@ -244,10 +253,17 @@ error_code cellNetCtlNetStartDialogLoadAsync(vm::cptr<CellNetCtlNetStartDialogPa
 		return CELL_NET_CTL_ERROR_INVALID_SIZE;
 	}
 
-	// TODO: Actually sign into PSN or an emulated network similar to PSN (ESN)
-	// TODO: Properly open the dialog prompt for sign in
-	sysutil_send_system_cmd(CELL_SYSUTIL_NET_CTL_NETSTART_LOADED, 0);
-	sysutil_send_system_cmd(CELL_SYSUTIL_NET_CTL_NETSTART_FINISHED, 0);
+	// This is a hack for Diva F 2nd that registers the sysutil callback after calling this function.
+	g_fxo->init<named_thread>("Delayed cellNetCtlNetStartDialogLoadAsync messages", []()
+	{
+		lv2_obj::wait_timeout(500000, nullptr);
+
+		if (thread_ctrl::state() != thread_state::aborting)
+		{
+			sysutil_send_system_cmd(CELL_SYSUTIL_NET_CTL_NETSTART_LOADED, 0);
+			sysutil_send_system_cmd(CELL_SYSUTIL_NET_CTL_NETSTART_FINISHED, 0);
+		}
+	});
 
 	return CELL_OK;
 }
@@ -256,7 +272,9 @@ error_code cellNetCtlNetStartDialogAbortAsync()
 {
 	cellNetCtl.error("cellNetCtlNetStartDialogAbortAsync()");
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}
@@ -268,7 +286,9 @@ error_code cellNetCtlNetStartDialogUnloadAsync(vm::ptr<CellNetCtlNetStartDialogR
 {
 	cellNetCtl.warning("cellNetCtlNetStartDialogUnloadAsync(result=*0x%x)", result);
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}
@@ -283,15 +303,7 @@ error_code cellNetCtlNetStartDialogUnloadAsync(vm::ptr<CellNetCtlNetStartDialogR
 		return CELL_NET_CTL_ERROR_INVALID_SIZE;
 	}
 
-	if (g_cfg.net.net_status == CELL_NET_CTL_STATE_Disconnected)
-	{
-		result->result = CELL_NET_CTL_ERROR_NET_NOT_CONNECTED;
-	}
-	else
-	{
-		// Hack
-		result->result = CELL_NET_CTL_ERROR_DIALOG_CANCELED;
-	}
+	result->result = nph->get_net_status() == CELL_NET_CTL_STATE_IPObtained ? 0 : CELL_NET_CTL_ERROR_DIALOG_CANCELED;
 
 	sysutil_send_system_cmd(CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED, 0);
 
@@ -302,7 +314,9 @@ error_code cellNetCtlGetNatInfo(vm::ptr<CellNetCtlNatInfo> natInfo)
 {
 	cellNetCtl.warning("cellNetCtlGetNatInfo(natInfo=*0x%x)", natInfo);
 
-	if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
+	const auto nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph->is_netctl_init)
 	{
 		return CELL_NET_CTL_ERROR_NOT_INITIALIZED;
 	}

rpcs3/Emu/Cell/Modules/cellNetCtl.h

@@ -352,8 +352,3 @@ struct CellGameUpdateParam
 
 using CellGameUpdateCallback = void(s32 status, s32 error_code, vm::ptr<void> userdata);
 using CellGameUpdateCallbackEx = void(vm::ptr<CellGameUpdateResult> result, vm::ptr<void> userdata);
-
-struct cell_net_ctl_manager
-{
-	atomic_t<bool> is_initialized = false;
-};

rpcs3/Emu/Cell/Modules/cellOskDialog.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/RSX/Overlays/overlay_osk.h"
 #include "Input/pad_thread.h"
@@ -62,8 +63,7 @@ std::shared_ptr<OskDialogBase> _get_osk_dialog(bool create = false)
 
 		if (auto manager = g_fxo->get<rsx::overlays::display_manager>())
 		{
-			auto dlg = std::make_shared<rsx::overlays::osk_latin>();
-
+			std::shared_ptr<rsx::overlays::osk_dialog> dlg = std::make_shared<rsx::overlays::osk_dialog>();
 			osk->dlg = manager->add(dlg);
 		}
 		else
@@ -105,7 +105,9 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
 
 	// Get the OSK options
 	u32 maxLength = (inputFieldInfo->limit_length >= CELL_OSKDIALOG_STRING_SIZE) ? 511 : u32{inputFieldInfo->limit_length};
-	u32 options = dialogParam->prohibitFlgs;
+	const u32 prohibitFlgs = dialogParam->prohibitFlgs;
+	const u32 allowOskPanelFlg = dialogParam->allowOskPanelFlg;
+	const u32 firstViewPanel = dialogParam->firstViewPanel;
 
 	// Get init text and prepare return value
 	osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK;
@@ -242,7 +244,7 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
 
 	Emu.CallAfter([=, &result]()
 	{
-		osk->Create("On Screen Keyboard", message, osk->osk_text, maxLength, options);
+		osk->Create("On Screen Keyboard", message, osk->osk_text, maxLength, prohibitFlgs, allowOskPanelFlg, firstViewPanel);
 		result = true;
 	});
 

rpcs3/Emu/Cell/Modules/cellOskDialog.h

@@ -243,7 +243,7 @@ enum class OskDialogState
 class OskDialogBase
 {
 public:
-	virtual void Create(const std::string& title, const std::u16string& message, char16_t* init_text, u32 charlimit, u32 options) = 0;
+	virtual void Create(const std::string& title, const std::u16string& message, char16_t* init_text, u32 charlimit, u32 prohibit_flags, u32 panel_flag, u32 first_view_panel) = 0;
 	virtual void Close(bool accepted) = 0;
 	virtual ~OskDialogBase();
 

rpcs3/Emu/Cell/Modules/cellPad.cpp

@@ -5,6 +5,7 @@
 
 #include "Emu/Io/pad_types.h"
 #include "Input/pad_thread.h"
+#include "Input/product_info.h"
 #include "cellPad.h"
 
 LOG_CHANNEL(sys_io);
@@ -433,7 +434,6 @@ error_code cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 
 	const auto& pads = handler->GetPads();
 
-	// TODO: Support other types of controllers
 	for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; ++i)
 	{
 		if (i >= config->max_connect)
@@ -445,7 +445,7 @@ error_code cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 		info->device_capability[i] = pads[i]->m_device_capability;
 		info->device_type[i] = pads[i]->m_device_type;
 		info->pclass_type[i] = pads[i]->m_class_type;
-		info->pclass_profile[i] = 0x0;
+		info->pclass_profile[i] = pads[i]->m_class_profile;
 	}
 
 	return CELL_OK;
@@ -478,10 +478,10 @@ error_code cellPadPeriphGetData(u32 port_no, vm::ptr<CellPadPeriphData> data)
 	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	// todo: support for 'unique' controllers, which goes in offsets 24+ in padData
 	data->pclass_type = pad->m_class_type;
-	data->pclass_profile = 0x0;
+	data->pclass_profile = pad->m_class_profile;
 
+	// TODO: support for 'unique' controllers, which goes in offsets 24+ in padData (CELL_PAD_PCLASS_BTN_OFFSET)
 	return cellPadGetData(port_no, data.ptr(&CellPadPeriphData::cellpad_data));
 }
 
@@ -636,43 +636,40 @@ error_code cellPadGetInfo(vm::ptr<CellPadInfo> info)
 		pads[i]->m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; // TODO: should ASSIGN flags be cleared here?
 		info->status[i] = pads[i]->m_port_status;
 
-		// TODO: Allow selecting different product IDs
-		switch (pads[i]->m_class_type)
+		if (pads[i]->m_vendor_id == 0 || pads[i]->m_product_id == 0)
 		{
-		case CELL_PAD_PCLASS_TYPE_GUITAR:
-			// Sony Computer Entertainment America
-			info->vendor_id[i] = 0x12BA;
-			// RedOctane Guitar (Guitar Hero)
-			info->product_id[i] = 0x0100;
-			// Harmonix Guitar (Rock Band)
-			// info->product_id[i] = 0x0200;
-			break;
-		case CELL_PAD_PCLASS_TYPE_DRUM:
-			// Sony Computer Entertainment America
-			info->vendor_id[i] = 0x12BA;
-			// RedOctane Drum Kit (Guitar Hero)
-			info->product_id[i] = 0x0120;
-			// Harmonix Drum Kit (Rock Band)
-			// info->product_id[i] = 0x0210;
-			break;
-		case CELL_PAD_PCLASS_TYPE_DJ:
-			// Sony Computer Entertainment America
-			info->vendor_id[i] = 0x12BA;
-			// DJ Hero Turntable
-			info->product_id[i] = 0x0140;
-			break;
-		case CELL_PAD_PCLASS_TYPE_DANCEMAT:
-			// Konami Digital Entertainment
-			info->vendor_id[i] = 0x1CCF;
-			// Dance Dance Revolution Mat
-			info->product_id[i] = 0x0140;
-			break;
-		default:
-			// Sony Corp.
-			info->vendor_id[i] = 0x054C;
-			// PlayStation 3 Controller
-			info->product_id[i] = 0x0268;
-			break;
+			// Fallback to defaults
+
+			input::product_info product;
+
+			switch (pads[i]->m_class_type)
+			{
+			case CELL_PAD_PCLASS_TYPE_GUITAR:
+				product = input::get_product_info(input::product_type::red_octane_gh_guitar);
+				break;
+			case CELL_PAD_PCLASS_TYPE_DRUM:
+				product = input::get_product_info(input::product_type::red_octane_gh_drum_kit);
+				break;
+			case CELL_PAD_PCLASS_TYPE_DJ:
+				product = input::get_product_info(input::product_type::dj_hero_turntable);
+				break;
+			case CELL_PAD_PCLASS_TYPE_DANCEMAT:
+				product = input::get_product_info(input::product_type::dance_dance_revolution_mat);
+				break;
+			case CELL_PAD_PCLASS_TYPE_NAVIGATION:
+			case CELL_PAD_PCLASS_TYPE_STANDARD:
+			default:
+				product = input::get_product_info(input::product_type::playstation_3_controller);
+				break;
+			}
+
+			info->vendor_id[i] = product.vendor_id;
+			info->product_id[i] = product.product_id;
+		}
+		else
+		{
+			info->vendor_id[i] = pads[i]->m_vendor_id;
+			info->product_id[i] = pads[i]->m_product_id;
 		}
 	}
 
@@ -927,8 +924,19 @@ error_code cellPadLddRegisterController()
 	if (handle < 0)
 		return CELL_PAD_ERROR_TOO_MANY_DEVICES;
 
+	const auto product = input::get_product_info(input::product_type::playstation_3_controller);
+
 	auto& pads = handler->GetPads();
-	pads[handle]->Init(CELL_PAD_STATUS_CONNECTED | CELL_PAD_STATUS_ASSIGN_CHANGES | CELL_PAD_STATUS_CUSTOM_CONTROLLER, CELL_PAD_CAPABILITY_PS3_CONFORMITY, CELL_PAD_DEV_TYPE_LDD, 0);
+	pads[handle]->Init
+	(
+		CELL_PAD_STATUS_CONNECTED | CELL_PAD_STATUS_ASSIGN_CHANGES | CELL_PAD_STATUS_CUSTOM_CONTROLLER,
+		CELL_PAD_CAPABILITY_PS3_CONFORMITY,
+		CELL_PAD_DEV_TYPE_LDD,
+		CELL_PAD_PCLASS_TYPE_STANDARD,
+		product.pclass_profile,
+		product.vendor_id,
+		product.product_id
+	);
 	config->port_setting[handle] = 0;
 
 	return not_an_error(handle);

rpcs3/Emu/Cell/Modules/cellPad.h

@@ -34,6 +34,81 @@ enum
 	CELL_PAD_PCLASS_TYPE_NAVIGATION = 0x05,
 };
 
+// Profile of a Standard Type Controller
+// Profile of a Navigation Type Controller
+// Bits 0 – 31 All 0s
+
+// Profile of a Guitar Type Controller
+enum
+{
+	// Basic
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_1       = 0x00000001,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_2       = 0x00000002,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_3       = 0x00000004,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_4       = 0x00000008,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_5       = 0x00000010,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_STRUM_UP     = 0x00000020,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_STRUM_DOWN   = 0x00000040,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_WHAMMYBAR    = 0x00000080,
+	// All Basic                                = 0x000000FF
+
+	// Optional
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H1      = 0x00000100,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H2      = 0x00000200,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H3      = 0x00000400,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H4      = 0x00000800,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H5      = 0x00001000,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_5WAY_EFFECT  = 0x00002000,
+	CELL_PAD_PCLASS_PROFILE_GUITAR_TILT_SENS    = 0x00004000,
+	// All                                      = 0x00007FFF
+};
+
+// Profile of a Drum Type Controller
+enum
+{
+	CELL_PAD_PCLASS_PROFILE_DRUM_SNARE     = 0x00000001,
+	CELL_PAD_PCLASS_PROFILE_DRUM_TOM       = 0x00000002,
+	CELL_PAD_PCLASS_PROFILE_DRUM_TOM2      = 0x00000004,
+	CELL_PAD_PCLASS_PROFILE_DRUM_TOM_FLOOR = 0x00000008,
+	CELL_PAD_PCLASS_PROFILE_DRUM_KICK      = 0x00000010,
+	CELL_PAD_PCLASS_PROFILE_DRUM_CYM_HiHAT = 0x00000020,
+	CELL_PAD_PCLASS_PROFILE_DRUM_CYM_CRASH = 0x00000040,
+	CELL_PAD_PCLASS_PROFILE_DRUM_CYM_RIDE  = 0x00000080,
+	CELL_PAD_PCLASS_PROFILE_DRUM_KICK2     = 0x00000100,
+	// All                                 = 0x000001FF
+};
+
+// Profile of a DJ Deck Type Controller
+enum
+{
+	CELL_PAD_PCLASS_PROFILE_DJ_MIXER_ATTACK     = 0x00000001,
+	CELL_PAD_PCLASS_PROFILE_DJ_MIXER_CROSSFADER = 0x00000002,
+	CELL_PAD_PCLASS_PROFILE_DJ_MIXER_DSP_DIAL   = 0x00000004,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK1_STREAM1    = 0x00000008,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK1_STREAM2    = 0x00000010,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK1_STREAM3    = 0x00000020,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK1_PLATTER    = 0x00000040,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK2_STREAM1    = 0x00000080,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK2_STREAM2    = 0x00000100,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK2_STREAM3    = 0x00000200,
+	CELL_PAD_PCLASS_PROFILE_DJ_DECK2_PLATTER    = 0x00000400,
+	// All                                      = 0x000007FF
+};
+
+// Profile of a Dance Mat Type Controller
+enum
+{
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_CIRCLE   = 0x00000001,
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_CROSS    = 0x00000002,
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_TRIANGLE = 0x00000004,
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_SQUARE   = 0x00000008,
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_RIGHT    = 0x00000010,
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_LEFT     = 0x00000020,
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_UP       = 0x00000040,
+	CELL_PAD_PCLASS_PROFILE_DANCEMAT_DOWN     = 0x00000080,
+	// All                                    = 0x000000FF
+};
+
 // Length returned in CellPadData struct
 enum
 {

rpcs3/Emu/Cell/Modules/cellPngDec.cpp

@@ -151,7 +151,7 @@ void pngDecError(png_structp png_ptr, png_const_charp error_message)
 {
 	cellPngDec.error("%s", error_message);
 	// we can't return here or libpng blows up
-	throw LibPngCustomException("Fatal Error in libpng");
+	report_fatal_error("Fatal Error in libpng");
 }
 
 // Custom warning handler for libpng
@@ -486,14 +486,7 @@ s32 pngDecOpen(ppu_thread& ppu, PHandle handle, PPStream png_stream, PSrc source
 		png_set_progressive_read_fn(stream->png_ptr, stream.get_ptr(), pngDecInfoCallback, pngDecRowCallback, pngDecEndCallback);
 
 		// push header tag to libpng to keep us in sync
-		try
-		{
-			png_process_data(stream->png_ptr, stream->info_ptr, header, 8);
-		}
-		catch (LibPngCustomException&)
-		{
-			return CELL_PNGDEC_ERROR_HEADER;
-		}
+		png_process_data(stream->png_ptr, stream->info_ptr, header, 8);
 	}
 	else
 	{
@@ -729,15 +722,7 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr<u8> d
 		if (stream->buffer->length > stream->buffer->cursor)
 		{
 			u8* data = static_cast<u8*>(stream->buffer->data.get_ptr()) + stream->buffer->cursor;
-			try
-			{
-				png_process_data(stream->png_ptr, stream->info_ptr, data, stream->buffer->length - stream->buffer->cursor);
-			}
-			catch (LibPngCustomException&)
-			{
-				freeMem();
-				return CELL_PNGDEC_ERROR_FATAL;
-			}
+			png_process_data(stream->png_ptr, stream->info_ptr, data, stream->buffer->length - stream->buffer->cursor);
 			streamInfo->decodedStrmSize = ::narrow<u32>(stream->buffer->length);
 		}
 
@@ -747,15 +732,7 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr<u8> d
 		{
 			stream->cbCtrlStream.cbCtrlStrmFunc(ppu, streamInfo, streamParam, stream->cbCtrlStream.cbCtrlStrmArg);
 			streamInfo->decodedStrmSize += streamParam->strmSize;
-			try
-			{
-				png_process_data(stream->png_ptr, stream->info_ptr, static_cast<u8*>(streamParam->strmPtr.get_ptr()), streamParam->strmSize);
-			}
-			catch (LibPngCustomException&)
-			{
-				freeMem();
-				return CELL_PNGDEC_ERROR_FATAL;
-			}
+			png_process_data(stream->png_ptr, stream->info_ptr, static_cast<u8*>(streamParam->strmPtr.get_ptr()), streamParam->strmSize);
 		}
 
 		freeMem();
@@ -767,7 +744,6 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr<u8> d
 
 		// Decode the image
 		// todo: commandptr
-		try
 		{
 			for (u32 j = 0; j < stream->passes; j++)
 			{
@@ -779,10 +755,6 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr<u8> d
 			}
 			png_read_end(stream->png_ptr, stream->info_ptr);
 		}
-		catch (LibPngCustomException&)
-		{
-			return CELL_PNGDEC_ERROR_FATAL;
-		}
 	}
 
 	// Get the number of iTXt, tEXt and zTXt chunks
@@ -862,14 +834,7 @@ s32 cellPngDecExtReadHeader(PHandle handle, PStream stream, PInfo info, PExtInfo
 
 	// lets push what we have so far
 	u8* data = static_cast<u8*>(stream->buffer->data.get_ptr()) + stream->buffer->cursor;
-	try
-	{
-		png_process_data(stream->png_ptr, stream->info_ptr, data, stream->buffer->length);
-	}
-	catch (LibPngCustomException&)
-	{
-		return CELL_PNGDEC_ERROR_HEADER;
-	}
+	png_process_data(stream->png_ptr, stream->info_ptr, data, stream->buffer->length);
 
 	// lets hope we pushed enough for callback
 	pngSetHeader(stream.get_ptr());

rpcs3/Emu/Cell/Modules/cellRtc.h

@@ -1,24 +1,24 @@
-#pragma once
+#pragma once
 
 #include "Utilities/BEType.h"
 
 // Return Codes
-enum
+enum CellRtcError
 {
-	CELL_RTC_ERROR_NOT_INITIALIZED      = 0x80010601,
-	CELL_RTC_ERROR_INVALID_POINTER      = 0x80010602,
-	CELL_RTC_ERROR_INVALID_VALUE        = 0x80010603,
-	CELL_RTC_ERROR_INVALID_ARG          = 0x80010604,
-	CELL_RTC_ERROR_NOT_SUPPORTED        = 0x80010605,
-	CELL_RTC_ERROR_NO_CLOCK             = 0x80010606,
-	CELL_RTC_ERROR_BAD_PARSE            = 0x80010607,
-	CELL_RTC_ERROR_INVALID_YEAR         = 0x80010621,
-	CELL_RTC_ERROR_INVALID_MONTH        = 0x80010622,
-	CELL_RTC_ERROR_INVALID_DAY          = 0x80010623,
-	CELL_RTC_ERROR_INVALID_HOUR         = 0x80010624,
-	CELL_RTC_ERROR_INVALID_MINUTE       = 0x80010625,
-	CELL_RTC_ERROR_INVALID_SECOND       = 0x80010626,
-	CELL_RTC_ERROR_INVALID_MICROSECOND  = 0x80010627,
+	CELL_RTC_ERROR_NOT_INITIALIZED     = 0x80010601,
+	CELL_RTC_ERROR_INVALID_POINTER     = 0x80010602,
+	CELL_RTC_ERROR_INVALID_VALUE       = 0x80010603,
+	CELL_RTC_ERROR_INVALID_ARG         = 0x80010604,
+	CELL_RTC_ERROR_NOT_SUPPORTED       = 0x80010605,
+	CELL_RTC_ERROR_NO_CLOCK            = 0x80010606,
+	CELL_RTC_ERROR_BAD_PARSE           = 0x80010607,
+	CELL_RTC_ERROR_INVALID_YEAR        = 0x80010621,
+	CELL_RTC_ERROR_INVALID_MONTH       = 0x80010622,
+	CELL_RTC_ERROR_INVALID_DAY         = 0x80010623,
+	CELL_RTC_ERROR_INVALID_HOUR        = 0x80010624,
+	CELL_RTC_ERROR_INVALID_MINUTE      = 0x80010625,
+	CELL_RTC_ERROR_INVALID_SECOND      = 0x80010626,
+	CELL_RTC_ERROR_INVALID_MICROSECOND = 0x80010627,
 };
 
 struct CellRtcTick
@@ -36,3 +36,16 @@ struct CellRtcDateTime
 	be_t<u16> second;
 	be_t<u32> microsecond;
 };
+
+error_code cellRtcTickAddYears(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd);
+error_code cellRtcTickAddMonths(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 lAdd);
+error_code cellRtcTickAddDays(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 lAdd);
+error_code cellRtcTickAddHours(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 lAdd);
+error_code cellRtcTickAddMinutes(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd);
+error_code cellRtcTickAddSeconds(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd);
+
+error_code cellRtcSetTick(vm::ptr<CellRtcDateTime> pTime, vm::cptr<CellRtcTick> pTick);
+u32 cellRtcGetTickResolution();
+error_code cellRtcCheckValid(vm::cptr<CellRtcDateTime> pTime);
+error_code cellRtcGetDayOfWeek(s32 year, s32 month, s32 day);
+error_code cellRtcGetTick(vm::cptr<CellRtcDateTime> pTime, vm::ptr<CellRtcTick> pTick);

rpcs3/Emu/Cell/Modules/cellSail.cpp

@@ -703,9 +703,9 @@ s32 cellSailPlayerSetParameter(vm::ptr<CellSailPlayer> pSelf, s32 parameterType,
 
 	switch (parameterType)
 	{
-	case CELL_SAIL_PARAMETER_GRAPHICS_ADAPTER_BUFFER_RELEASE_DELAY: pSelf->graphics_adapter_buffer_release_delay = param1; break; // TODO: Stream index
-	case CELL_SAIL_PARAMETER_CONTROL_PPU_THREAD_STACK_SIZE:         pSelf->control_ppu_thread_stack_size = param0; break;
-	case CELL_SAIL_PARAMETER_ENABLE_APOST_SRC:                      pSelf->enable_apost_src = param1; break; // TODO: Stream index
+	case CELL_SAIL_PARAMETER_GRAPHICS_ADAPTER_BUFFER_RELEASE_DELAY: pSelf->graphics_adapter_buffer_release_delay = static_cast<u32>(param1); break; // TODO: Stream index
+	case CELL_SAIL_PARAMETER_CONTROL_PPU_THREAD_STACK_SIZE:         pSelf->control_ppu_thread_stack_size = static_cast<u32>(param0); break;
+	case CELL_SAIL_PARAMETER_ENABLE_APOST_SRC:                      pSelf->enable_apost_src = static_cast<u32>(param1); break; // TODO: Stream index
 	default: cellSail.todo("cellSailPlayerSetParameter(): unimplemented parameter %s", ParameterCodeToName(parameterType));
 	}
 
@@ -718,6 +718,7 @@ s32 cellSailPlayerGetParameter(vm::ptr<CellSailPlayer> pSelf, s32 parameterType,
 
 	switch (parameterType)
 	{
+	case 0:
 	default: cellSail.error("cellSailPlayerGetParameter(): unimplemented parameter %s", ParameterCodeToName(parameterType));
 	}
 
@@ -806,7 +807,7 @@ s32 cellSailPlayerCreateDescriptor(vm::ptr<CellSailPlayer> pSelf, s32 streamType
 			{
 				if (fs::file f{ vfs::get(uri.substr(12)) })
 				{
-					u64 size = f.size();
+					u32 size = ::size32(f);
 					u32 buffer = vm::alloc(size, vm::main);
 					auto bufPtr = vm::cptr<PamfHeader>::make(buffer);
 					PamfHeader *buf = const_cast<PamfHeader*>(bufPtr.get_ptr());